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

Updated POM versions
Updated Test class
2013-05-15 20:34:15 +02:00 · 2013-05-15 20:31:44 +02:00 · 2013-05-15 18:15:12 +01:00 · 2013-05-15 18:14:54 +01:00 · 2013-05-15 18:06:54 +01:00 · 2013-05-15 16:24:57 +01:00
73 changed files with 7888 additions and 5265 deletions
@@ -0,0 +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 {
+
+}
@@ -0,0 +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 "";
+}
@@ -0,0 +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 "";
+}
@@ -0,0 +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);
+		}
+	}
+
+}
@@ -0,0 +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.
@@ -0,0 +1,21 @@
+The Movie DB API
+================
+
+Author: Stuart Boston (Omertron AT Gmail DOT com)
+
+This API uses the TheMovieDB.org API as specified here http://api.themoviedb.org/
+
+Originally written for use by YetAnotherMovieJukebox (YAMJ) http://code.google.com/p/moviejukebox/
+But anyone can feel free to use it for other projects as well.
+
+TheMovieDB.org is an excellent open database for movie and film content. I encourage you to check it out and contribute to keep it growing.
+http://www.themoviedb.org
+
+Project Logging
+---------------
+This project uses SLF4J (http://www.slf4j.org) to abstract the logging in the project.
+To use the logging in your own project you should add one of the bindings listed [HERE](http://www.slf4j.org/manual.html#swapping)
+
+Project Documentation
+---------------------
+The automatically generated documentation can be found [HERE](http://omertron.github.com/api-themoviedb/)
@@ -13,10 +13,58 @@

    <groupId>com.omertron</groupId>
    <artifactId>themoviedbapi</artifactId>
-    <version>3.3</version>
-    <name>API-The MovieDB</name>
+    <version>3.5</version>
    <packaging>jar</packaging>
+
+    <name>API-The MovieDB</name>
    <description>API for the TheMovieDb.org website</description>
+    <url>https://github.com/Omertron/api-themoviedb</url>
+    <inceptionYear>2012</inceptionYear>
+
+    <developers>
+        <developer>
+            <name>Stuart Boston</name>
+            <email>omertron@gmail.com</email>
+            <id>omertron</id>
+            <url>http://omertron.com</url>
+            <timezone>0</timezone>
+            <roles>
+                <role>developer</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>GNU General Public License v3+</name>
+            <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <scm>
+        <url>scm:git:git@github.com:Omertron/api-themoviedb.git</url>
+        <connection>scm:git:git@github.com:Omertron/api-themoviedb.git</connection>
+        <developerConnection>scm:git:git@github.com:Omertron/api-themoviedb.git</developerConnection>
+    </scm>
+
+    <distributionManagement>
+        <site>
+            <id>github-project-site</id>
+            <name>GitHub Project Pages</name>
+            <url>gitsite:git@github.com/Omertron/api-themoviedb.git</url>
+        </site>
+    </distributionManagement>
+
+    <issueManagement>
+        <system>GitHub</system>
+        <url>https://github.com/Omertron/api-themoviedb/issues</url>
+    </issueManagement>
+
+    <ciManagement>
+        <system>Jenkins CI</system>
+        <url>http://jenkins.omertron.com/job/API-TheMovieDb/</url>
+    </ciManagement>

    <properties>
        <skipTests>false</skipTests>
@@ -25,69 +73,240 @@
        <distribution.format>zip</distribution.format>
    </properties>

-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/Omertron/api-themoviedb/issues</url>
-    </issueManagement>
-
-    <ciManagement>
-        <system>Hudson CI</system>
-        <url>http://jenkins.omertron.com/job/API-TheMovieDb/</url>
-    </ciManagement>
-
-    <scm>
-        <url>scm:git:git@github.com:Omertron/api-themoviedb.git</url>
-        <connection>scm:git:git@github.com:Omertron/api-themoviedb.git</connection>
-        <developerConnection>scm:git:git@github.com:Omertron/api-themoviedb.git</developerConnection>
-    </scm>
-
    <dependencies>
-
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>4.11</version>
            <scope>test</scope>
        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
-
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
-            <version>2.1.2</version>
+            <version>2.2.1</version>
        </dependency>
-
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
-            <version>2.1.2</version>
+            <version>2.2.1</version>
        </dependency>
-
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.1.2</version>
+            <version>2.2.1</version>
        </dependency>
-
        <dependency>
            <groupId>commons-codec</groupId>
            <artifactId>commons-codec</artifactId>
-            <version>1.7</version>
+            <version>1.8</version>
        </dependency>
-
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
            <version>3.1</version>
        </dependency>
-
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.7.5</version>
+            <scope>test</scope>
+        </dependency>
    </dependencies>

+    <build>
+        <finalName>${project.artifactId}-${project.version}-${buildNumber}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.2</version>
+                <configuration>
+                    <shortRevisionLength>10</shortRevisionLength>
+                    <doCheck>false</doCheck>
+                    <doUpdate>false</doUpdate>
+                    <timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <failOnError>true</failOnError>
+                    <verbose>true</verbose>
+                    <!-- excludes><exclude>**/*</exclude></excludes -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Specification-Title>${project.name}</Specification-Title>
+                            <Specification-Version>${project.version}</Specification-Version>
+                            <Implementation-Version>${buildNumber}</Implementation-Version>
+                            <Implementation-Title>${timestamp}</Implementation-Title>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.13</version>
+                <configuration>
+                    <!-- To skip tests by default -->
+                    <skipTests>${skipTests}</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>create-version-txt</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target>
+                                <property name="version_file" value="${project.build.directory}/version.txt" />
+                                <property name="header_line" value="The MovieDb API${line.separator}" />
+                                <property name="build_date_line" value="Build Date: ${timestamp}${line.separator}" />
+                                <property name="version_line" value="Version: ${project.version}${line.separator}" />
+                                <property name="buildnumber_line" value="Git-SHA: ${buildNumber}${line.separator}" />
+                                <echo>Writing version file: ${version_file}</echo>
+                                <echo file="${version_file}" append="false">${header_line}</echo>
+                                <echo file="${version_file}" append="true">${build_date_line}</echo>
+                                <echo file="${version_file}" append="true">${version_line}</echo>
+                                <echo file="${version_file}" append="true">${buildnumber_line}</echo>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>distro-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/resources/bin.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <reportPlugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-project-info-reports-plugin</artifactId>
+                            <version>2.2</version>
+                            <reports>
+                                <report>index</report>
+                                <report>scm</report>
+                                <report>issue-tracking</report>
+                                <report>help</report>
+                                <report>dependency-convergence</report>
+                                <report>summary</report>
+                                <report>dependency-management</report>
+                                <report>dependencies</report>
+                                <report>license</report>
+                                <report>modules</report>
+                            </reports>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-javadoc-plugin</artifactId>
+                            <version>2.9</version>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.5</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-provider-gitexe</artifactId>
+                <version>1.8.1</version>
+            </extension>
+            <extension>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-manager-plexus</artifactId>
+                <version>1.8.1</version>
+            </extension>
+            <extension>
+                <groupId>org.kathrynhuxtable.maven.wagon</groupId>
+                <artifactId>wagon-gitsite</artifactId>
+                <version>0.3.1</version>
+            </extension>
+        </extensions>
+
+    </build>
+
    <profiles>
        <profile>
            <id>release-sign-artifacts</id>
@@ -116,123 +335,4 @@
        </profile>
    </profiles>

-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.1</version>
-                <configuration>
-                    <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
-                    <revisionOnScmFailure>0000</revisionOnScmFailure>
-                    <timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>create</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <failOnError>true</failOnError>
-                    <verbose>true</verbose>
-                    <!-- excludes><exclude>**/*</exclude></excludes -->
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Specification-Title>${project.name}</Specification-Title>
-                            <Specification-Version>${project.version}</Specification-Version>
-                            <Implementation-Version>${buildNumber}</Implementation-Version>
-                            <Implementation-Title>${timestamp}</Implementation-Title>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-
-            <!-- To skip tests by default -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.3</version>
-                <configuration>
-                    <skipTests>${skipTests}</skipTests>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>create-version-txt</id>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <target>
-                                <property name="version_file" value="${project.build.directory}/version.txt" />
-                                <property name="header_line" value="The MovieDb API${line.separator}" />
-                                <property name="build_date_line" value="Build Date: ${timestamp}${line.separator}" />
-                                <property name="version_line" value="Version: ${project.version}${line.separator}" />
-                                <property name="revision_line" value="Revision: r${buildNumber}${line.separator}" />
-                                <echo>Writing version file: ${version_file}</echo>
-                                <echo file="${version_file}" append="false">${header_line}</echo>
-                                <echo file="${version_file}" append="true">${build_date_line}</echo>
-                                <echo file="${version_file}" append="true">${version_line}</echo>
-                                <echo file="${version_file}" append="true">${revision_line}</echo>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
-                    <execution>
-                        <id>distro-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/resources/bin.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>1.3.1</version>
-            </plugin>
-        </plugins>
-
-        <finalName>${project.artifactId}-${project.version}-r${buildNumber}</finalName>
-        <resources>
-        </resources>
-
-    </build>
 </project>
@@ -1,9 +0,0 @@
-Author: Stuart Boston (Omertron AT Gmail DOT com)
-
-Originally written for use by YetAnotherMovieJukebox (YAMJ) http://code.google.com/p/moviejukebox/
-But anyone can feel free to use it for other projects as well.
-
-This uses TheMovieDB.org API as specified here http://api.themoviedb.org/
-TheMovieDB.org is an excellent open database for movie and film content. I encourage you to check it
-out and contribute to keep it growing.
-http://www.themoviedb.org
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -21,10 +21,41 @@ package com.omertron.themoviedbapi;

 public class MovieDbException extends Exception {

-    private static final long serialVersionUID = -8952129102483143278L;
+    private static final long serialVersionUID = 1L;

    public enum MovieDbExceptionType {
-        UNKNOWN_CAUSE, INVALID_URL, HTTP_404_ERROR, MOVIE_ID_NOT_FOUND, MAPPING_FAILED, CONNECTION_ERROR, INVALID_IMAGE, AUTHORISATION_FAILURE;
+        /*
+         * 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;
    }

    private final MovieDbExceptionType exceptionType;
@@ -1,115 +1,116 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class AlternativeTitle implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[AlternativeTitle=");
-        sb.append("[country=").append(country);
-        sb.append("],[title=").append(title);
-        sb.append("]]");
-        return 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.model;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+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() {
+        StringBuilder sb = new StringBuilder("[AlternativeTitle=");
+        sb.append("[country=").append(country);
+        sb.append("],[title=").append(title);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,195 +1,208 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- * The artwork type information
- *
- * @author Stuart
- */
-public class Artwork implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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;
-    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;
-    }
-    // </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;
-    }
-    // </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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[Artwork=");
-        sb.append("[aspectRatio=").append(aspectRatio);
-        sb.append("],[filePath=").append(filePath);
-        sb.append("],[height=").append(height);
-        sb.append("],[language=").append(language);
-        sb.append("],[width=").append(width);
-        sb.append("],[artworkType=").append(artworkType);
-        sb.append("]]");
-        return sb.toString();
-    }
-}
+/*
+ *      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.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() {
+        StringBuilder sb = new StringBuilder("[Artwork=");
+        sb.append("[aspectRatio=").append(aspectRatio);
+        sb.append("],[filePath=").append(filePath);
+        sb.append("],[height=").append(height);
+        sb.append("],[language=").append(language);
+        sb.append("],[width=").append(width);
+        sb.append("],[artworkType=").append(artworkType);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -0,0 +1,122 @@
+/*
+ *      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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ChangeItem {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Logger
+     */
+    private static final Logger LOG = LoggerFactory.getLogger(MovieChanges.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("action")
+    private String action;
+    @JsonProperty("time")
+    private String time;
+    @JsonProperty("value")
+    private ChangeValue value;
+    @JsonProperty("original_value")
+    private ChangeValue originalValue;
+    @JsonProperty("iso_639_1")
+    private String language;
+
+    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
+    public String getId() {
+        return id;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public ChangeValue getValue() {
+        return value;
+    }
+
+    public ChangeValue getOriginalValue() {
+        return originalValue;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public void setValue(ChangeValue value) {
+        this.value = value;
+    }
+
+    public void setOriginalValue(ChangeValue originalValue) {
+        this.originalValue = originalValue;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    //</editor-fold>
+
+    @Override
+    public String toString() {
+        return "ChangeItem{" + "id=" + id + ", action=" + action + ", time=" + time + ", value=" + value + '}';
+    }
+
+    /**
+     * 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());
+    }
+}
@@ -0,0 +1,128 @@
+/*
+ *      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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ChangeValue {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Logger
+     */
+    private static final Logger LOG = LoggerFactory.getLogger(MovieChanges.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("poster")
+    private Artwork poster;
+    @JsonProperty("backdrop")
+    private Artwork backdrop;
+    @JsonProperty("title")
+    private String title;
+    @JsonProperty("iso_3166_1")
+    private String language;
+    @JsonProperty("site")
+    private String site;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("id")
+    private int id;
+
+    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
+    public Artwork getPoster() {
+        return poster;
+    }
+
+    public Artwork getBackdrop() {
+        return backdrop;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getId() {
+        return id;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
+    public void setPoster(Artwork poster) {
+        this.poster = poster;
+    }
+
+    public void setBackdrop(Artwork backdrop) {
+        this.backdrop = backdrop;
+        backdrop.setArtworkType(ArtworkType.BACKDROP);
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+    
+    //</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());
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -24,7 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import java.io.Serializable;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
@@ -37,7 +38,7 @@ public class Collection implements Serializable {
    /*
     * Logger
     */
-    private static final Logger logger = Logger.getLogger(Collection.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Collection.class);
    /*
     * Properties
     */
@@ -123,7 +124,7 @@ public class Collection implements Serializable {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    @Override
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -24,7 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
@@ -36,7 +37,7 @@ public class CollectionInfo implements Serializable {
    /*
     * Logger
     */
-    private static final Logger logger = Logger.getLogger(CollectionInfo.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CollectionInfo.class);
    /*
     * Properties
     */
@@ -44,6 +45,8 @@ public class CollectionInfo implements Serializable {
    private int id;
    @JsonProperty("name")
    private String name;
+    @JsonProperty("overview")
+    private String overview;
    @JsonProperty("poster_path")
    private String posterPath;
    @JsonProperty("backdrop_path")
@@ -64,6 +67,10 @@ public class CollectionInfo implements Serializable {
        return name;
    }

+    public String getOverview() {
+        return overview;
+    }
+
    public List<Collection> getParts() {
        return parts;
    }
@@ -86,6 +93,10 @@ public class CollectionInfo implements Serializable {
        this.name = name;
    }

+    public void setOverview(String overview) {
+        this.overview = overview;
+    }
+
    public void setParts(List<Collection> parts) {
        this.parts = parts;
    }
@@ -106,7 +117,7 @@ public class CollectionInfo implements Serializable {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    @Override
@@ -114,6 +125,7 @@ public class CollectionInfo implements Serializable {
        StringBuilder sb = new StringBuilder("[CollectionInfo=");
        sb.append("[id=").append(id);
        sb.append("],[name=").append(name);
+        sb.append("],[overview=").append(overview);
        sb.append("],[posterPath=").append(posterPath);
        sb.append("],[backdropPath=").append(backdropPath);
        sb.append("],[# of parts=").append(parts.size());
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -22,7 +22,8 @@ package com.omertron.themoviedbapi.model;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 * Company information
@@ -33,7 +34,7 @@ public class Company implements Serializable {

    private static final long serialVersionUID = 1L;
    // Logger
-    private static final Logger logger = Logger.getLogger(Company.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Company.class);
    private static final String DEFAULT_STRING = "";
    // Properties
    @JsonProperty("id")
@@ -122,7 +123,7 @@ public class Company implements Serializable {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    @Override
@@ -0,0 +1,262 @@
+/*
+ *      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 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
+ *
+ * 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 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=";
+    private static final String PARAM_WITH_GENRES = "with_genres=";
+    private static final String PARAM_RELEASE_DATE_GTE = "release_date.gte=";
+    private static final String PARAM_RELEASE_DATE_LTE = "release_date.lte=";
+    private static final String PARAM_CERTIFICATION_COUNTRY = "certification_country=";
+    private static final String PARAM_CERTIFICATION_LTE = "certification.lte=";
+    private static final String PARAM_WITH_COMPANIES = "with_companies=";
+    private static final String PARAM_SORT_BY = "sort_by=";
+    private static final int YEAR_MIN = 1900;
+    private static final int YEAR_MAX = 2100;
+
+    /**
+     * Get the parameters
+     *
+     * This will be used to construct the URL in the API
+     *
+     * @return
+     */
+    public Map<String, String> getParams() {
+        return params;
+    }
+
+    /**
+     * Minimum value is 1 if included.
+     *
+     * @param page
+     */
+    public Discover page(int page) {
+        if (page > 0) {
+            params.put(PARAM_PAGE, String.valueOf(page));
+        }
+        return this;
+    }
+
+    /**
+     * ISO 639-1 code
+     *
+     * @param language
+     */
+    public Discover language(String language) {
+        if (StringUtils.isNotBlank(language)) {
+            params.put(PARAM_LANGUAGE, language);
+        }
+        return this;
+    }
+
+    /**
+     * Available options are <br>
+     * vote_average.desc<br>
+     * vote_average.asc<br>
+     * release_date.desc<br>
+     * release_date.asc<br>
+     * popularity.desc<br>
+     * popularity.asc
+     *
+     * @param sortBy
+     */
+    public Discover sortBy(String sortBy) {
+        if (StringUtils.isNotBlank(sortBy)) {
+            params.put(PARAM_SORT_BY, sortBy);
+        }
+        return this;
+    }
+
+    /**
+     * Toggle the inclusion of adult titles
+     *
+     * @param includeAdult
+     */
+    public Discover includeAdult(boolean includeAdult) {
+        params.put(PARAM_ADULT, String.valueOf(includeAdult));
+        return this;
+    }
+
+    /**
+     * Filter the results release dates to matches that include this value.
+     *
+     * @param year
+     */
+    public Discover year(int year) {
+        if (checkYear(year)) {
+            params.put(PARAM_YEAR, String.valueOf(year));
+        }
+        return this;
+    }
+
+    /**
+     * Filter the results so that only the primary release date year has this value
+     *
+     * @param primaryReleaseYear
+     */
+    public Discover primaryReleaseYear(int primaryReleaseYear) {
+        if (checkYear(primaryReleaseYear)) {
+            params.put(PARAM_PRIMARY_RELEASE_YEAR, String.valueOf(primaryReleaseYear));
+        }
+        return this;
+    }
+
+    /**
+     * Only include movies that are equal to, or have a vote count higher than this value
+     *
+     * @param voteCountGte
+     */
+    public Discover voteCountGte(int voteCountGte) {
+        if (voteCountGte > 0) {
+            params.put(PARAM_VOTE_COUNT_GTE, String.valueOf(voteCountGte));
+        }
+        return this;
+    }
+
+    /**
+     * Only include movies that are equal to, or have a higher average rating than this value
+     *
+     * @param voteAverageGte
+     */
+    public Discover voteAverageGte(float voteAverageGte) {
+        if (voteAverageGte > 0) {
+            params.put(PARAM_VOTE_AVERAGE_GTE, String.valueOf(voteAverageGte));
+        }
+        return this;
+    }
+
+    /**
+     * Only include movies with the specified genres.
+     *
+     * Expected value is an integer (the id of a genre).
+     *
+     * Multiple values can be specified.
+     *
+     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'
+     *
+     * @param withGenres
+     */
+    public Discover withGenres(String withGenres) {
+        if (StringUtils.isNotBlank(withGenres)) {
+            params.put(PARAM_WITH_GENRES, withGenres);
+        }
+        return this;
+    }
+
+    /**
+     * The minimum release to include.
+     *
+     * Expected format is YYYY-MM-DD.
+     *
+     * @param releaseDateGte
+     */
+    public Discover releaseDateGte(String releaseDateGte) {
+        if (StringUtils.isNotBlank(releaseDateGte)) {
+            params.put(PARAM_RELEASE_DATE_GTE, releaseDateGte);
+        }
+        return this;
+    }
+
+    /**
+     * The maximum release to include.
+     *
+     * Expected format is YYYY-MM-DD.
+     *
+     * @param releaseDateLte
+     */
+    public Discover releaseDateLte(String releaseDateLte) {
+        if (StringUtils.isNotBlank(releaseDateLte)) {
+            params.put(PARAM_RELEASE_DATE_LTE, releaseDateLte);
+        }
+        return this;
+    }
+
+    /**
+     * Only include movies with certifications for a specific country.
+     *
+     * When this value is specified, 'certificationLte' is required.
+     *
+     * A ISO 3166-1 is expected
+     *
+     * @param certificationCountry
+     */
+    public Discover certificationCountry(String certificationCountry) {
+        if (StringUtils.isNotBlank(certificationCountry)) {
+            params.put(PARAM_CERTIFICATION_COUNTRY, certificationCountry);
+        }
+        return this;
+    }
+
+    /**
+     * Only include movies with this certification and lower.
+     *
+     * Expected value is a valid certification for the specified 'certificationCountry'.
+     *
+     * @param certificationLte
+     */
+    public Discover certificationLte(String certificationLte) {
+        if (StringUtils.isNotBlank(certificationLte)) {
+            params.put(PARAM_CERTIFICATION_LTE, certificationLte);
+        }
+        return this;
+    }
+
+    /**
+     * Filter movies to include a specific company.
+     *
+     * Expected value is an integer (the id of a company).
+     *
+     * They can be comma separated to indicate an 'AND' query
+     *
+     * @param withCompanies
+     */
+    public Discover withCompanies(String withCompanies) {
+        if (StringUtils.isNotBlank(withCompanies)) {
+            params.put(PARAM_WITH_COMPANIES, withCompanies);
+        }
+        return this;
+    }
+
+    /**
+     * check the year is between the min and max
+     *
+     * @param year
+     * @return
+     */
+    private boolean checkYear(int year) {
+        return (year >= YEAR_MIN && year <= YEAR_MAX);
+    }
+}
@@ -1,116 +1,117 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-@JsonRootName("genre")
-public class Genre implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[Genre=");
-        sb.append("[id=").append(id);
-        sb.append("],[name=").append(name);
-        sb.append("]]");
-        return 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.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.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() {
+        StringBuilder sb = new StringBuilder("[Genre=");
+        sb.append("[id=").append(id);
+        sb.append("],[name=").append(name);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -0,0 +1,72 @@
+/*
+ *      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.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JobDepartment {
+
+    private static final long serialVersionUID = 1L;
+    // Logger
+    private static final Logger LOG = LoggerFactory.getLogger(MovieChanges.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;
+    }
+
+    public List<String> getJobs() {
+        return jobs;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setters">
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    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());
+    }
+}
@@ -1,117 +1,118 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-@JsonRootName("keyword")
-public class Keyword implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[Keyword=");
-        sb.append("[id=").append(id);
-        sb.append("],[name=").append(name);
-        sb.append("]]");
-        return 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.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.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() {
+        StringBuilder sb = new StringBuilder("[Keyword=");
+        sb.append("[id=").append(id);
+        sb.append("],[name=").append(name);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -0,0 +1,146 @@
+/*
+ *      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.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;
+
+    // <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;
+    }
+    // </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;
+    }
+    // </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());
+    }
+
+}
@@ -1,116 +1,117 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-@JsonRootName("spoken_language")
-public class Language implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[Language=");
-        sb.append("isoCode=").append(isoCode);
-        sb.append(", name=").append(name);
-        sb.append("]]");
-        return 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.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.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() {
+        StringBuilder sb = new StringBuilder("[Language=");
+        sb.append("isoCode=").append(isoCode);
+        sb.append(", name=").append(name);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -0,0 +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 java.io.Serializable;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class MovieChanges implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Logger
+     */
+    private static final Logger LOG = LoggerFactory.getLogger(MovieChanges.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("key")
+    private String key;
+    @JsonProperty("items")
+    private List<ChangeItem> items;
+
+    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
+    public String getKey() {
+        return key;
+    }
+
+    public List<ChangeItem> getItems() {
+        return items;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public void setItems(List<ChangeItem> items) {
+        this.items = items;
+    }
+    //</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());
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -21,9 +21,20 @@ 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 java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 * Movie Bean
@@ -36,23 +47,23 @@ public class MovieDb implements Serializable {
    /*
     * Logger
     */
-    private static final Logger logger = Logger.getLogger(MovieDb.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MovieDb.class);
    /*
     * Properties
     */
-    @JsonProperty(("backdrop_path"))
+    @JsonProperty("backdrop_path")
    private String backdropPath;
-    @JsonProperty(("id"))
+    @JsonProperty("id")
    private int id;
-    @JsonProperty(("original_title"))
+    @JsonProperty("original_title")
    private String originalTitle;
-    @JsonProperty(("popularity"))
+    @JsonProperty("popularity")
    private float popularity;
-    @JsonProperty(("poster_path"))
+    @JsonProperty("poster_path")
    private String posterPath;
-    @JsonProperty(("release_date"))
+    @JsonProperty("release_date")
    private String releaseDate;
-    @JsonProperty(("title"))
+    @JsonProperty("title")
    private String title;
    @JsonProperty("adult")
    private boolean adult;
@@ -86,6 +97,27 @@ public class MovieDb implements Serializable {
    private int voteCount;
    @JsonProperty("status")
    private String status;
+    // AppendToResponse Properties
+    @JsonProperty("alternative_titles")
+    private WrapperAlternativeTitles alternativeTitles;
+    @JsonProperty("casts")
+    private WrapperMovieCasts casts;
+    @JsonProperty("images")
+    private WrapperImages images;
+    @JsonProperty("keywords")
+    private WrapperMovieKeywords keywords;
+    @JsonProperty("releases")
+    private WrapperReleaseInfo releases;
+    @JsonProperty("trailers")
+    private WrapperTrailers trailers;
+    @JsonProperty("translations")
+    private WrapperTranslations translations;
+    @JsonProperty("similar_movies")
+    private WrapperMovie similarMovies;
+    @JsonProperty("reviews")
+    private WrapperReviews reviews;
+    @JsonProperty("lists")
+    private WrapperMovieList lists;

    // <editor-fold defaultstate="collapsed" desc="Getter methods">
    public String getBackdropPath() {
@@ -276,6 +308,95 @@ public class MovieDb implements Serializable {

    // </editor-fold>

+    //<editor-fold defaultstate="collapsed" desc="AppendToResponse Getters">
+    public List<AlternativeTitle> getAlternativeTitles() {
+        return alternativeTitles.getTitles();
+    }
+
+    public List<PersonCast> getCast() {
+        return casts.getCast();
+    }
+
+    public List<PersonCrew> getCrew() {
+        return casts.getCrew();
+    }
+
+    public List<Artwork> getImages() {
+        return images.getAll();
+    }
+
+    public List<Keyword> getKeywords() {
+        return keywords.getKeywords();
+    }
+
+    public List<ReleaseInfo> getReleases() {
+        return releases.getCountries();
+    }
+
+    public List<Trailer> getTrailers() {
+        return trailers.getAll();
+    }
+
+    public List<Translation> getTranslations() {
+        return translations.getTranslations();
+    }
+
+    public List<MovieDb> getSimilarMovies() {
+        return similarMovies.getMovies();
+    }
+
+    public List<MovieList> getLists() {
+        return lists.getMovieList();
+    }
+
+    public List<Reviews> getReviews() {
+        return reviews.getReviews();
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="AppendToResponse Setters">
+    public void setAlternativeTitles(WrapperAlternativeTitles alternativeTitles) {
+        this.alternativeTitles = alternativeTitles;
+    }
+
+    public void setCasts(WrapperMovieCasts casts) {
+        this.casts = casts;
+    }
+
+    public void setImages(WrapperImages images) {
+        this.images = images;
+    }
+
+    public void setKeywords(WrapperMovieKeywords keywords) {
+        this.keywords = keywords;
+    }
+
+    public void setReleases(WrapperReleaseInfo releases) {
+        this.releases = releases;
+    }
+
+    public void setTrailers(WrapperTrailers trailers) {
+        this.trailers = trailers;
+    }
+
+    public void setTranslations(WrapperTranslations translations) {
+        this.translations = translations;
+    }
+
+    public void setSimilarMovies(WrapperMovie similarMovies) {
+        this.similarMovies = similarMovies;
+    }
+
+    public void setLists(WrapperMovieList lists) {
+        this.lists = lists;
+    }
+
+    public void setReviews(WrapperReviews reviews) {
+        this.reviews = reviews;
+    }
+    
+    //</editor-fold>
+
    /**
     * Handle unknown properties and print a message
     *
@@ -287,7 +408,7 @@ public class MovieDb implements Serializable {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    //<editor-fold defaultstate="collapsed" desc="Equals and HashCode">
@@ -0,0 +1,151 @@
+/*
+ *      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.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());
+    }
+
+}
@@ -0,0 +1,146 @@
+/*
+ *      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.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 "MovieList{" + "description=" + description + ", favoriteCount=" + favoriteCount + ", id=" + id + ", itemCount=" + itemCount + ", language=" + language + ", name=" + name + ", posterPath=" + posterPath + '}';
+    }
+}
@@ -1,322 +1,343 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-public class Person implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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;
-
-    /**
-     * 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;
-    }
-    // </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;
-    }
-    // </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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[Person=");
-        sb.append("[id=").append(id);
-        sb.append("],[name=").append(name);
-        sb.append("],[profilePath=").append(profilePath);
-        sb.append("],[personType=").append(personType);
-        sb.append("],[department=").append(department);
-        sb.append("],[job=").append(job);
-        sb.append("],[character=").append(character);
-        sb.append("],[order=").append(order);
-        sb.append("],[adult=").append(adult);
-        sb.append("],[=aka").append(aka.toString());
-        sb.append("],[biography=").append(biography);
-        sb.append("],[birthday=").append(birthday);
-        sb.append("],[deathday=").append(deathday);
-        sb.append("],[homepage=").append(homepage);
-        sb.append("],[birthplace=").append(birthplace);
-        sb.append("]]");
-        return sb.toString();
-    }
-}
+/*
+ *      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.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() {
+        StringBuilder sb = new StringBuilder("[Person=");
+        sb.append("[id=").append(id);
+        sb.append("],[name=").append(name);
+        sb.append("],[profilePath=").append(profilePath);
+        sb.append("],[personType=").append(personType);
+        sb.append("],[department=").append(department);
+        sb.append("],[job=").append(job);
+        sb.append("],[character=").append(character);
+        sb.append("],[order=").append(order);
+        sb.append("],[adult=").append(adult);
+        sb.append("],[=aka").append(aka.toString());
+        sb.append("],[biography=").append(biography);
+        sb.append("],[birthday=").append(birthday);
+        sb.append("],[deathday=").append(deathday);
+        sb.append("],[homepage=").append(homepage);
+        sb.append("],[birthplace=").append(birthplace);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,172 +1,173 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class PersonCast implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[PersonCast=");
-        sb.append("id=").append(id);
-        sb.append("],[character=").append(character);
-        sb.append("],[name=").append(name);
-        sb.append("],[order=").append(order);
-        sb.append("],[profilePath=").append(profilePath);
-        sb.append("]]");
-        return sb.toString();
-    }
-}
+/*
+ *      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.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() {
+        StringBuilder sb = new StringBuilder("[PersonCast=");
+        sb.append("id=").append(id);
+        sb.append("],[character=").append(character);
+        sb.append("],[name=").append(name);
+        sb.append("],[order=").append(order);
+        sb.append("],[profilePath=").append(profilePath);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -22,7 +22,8 @@ package com.omertron.themoviedbapi.model;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
@@ -35,7 +36,7 @@ public class PersonCredit implements Serializable {
    /*
     * Logger
     */
-    private static final Logger logger = Logger.getLogger(PersonCredit.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PersonCredit.class);
    private static final String DEFAULT_STRING = "";
    /*
     * Properties
@@ -155,7 +156,7 @@ public class PersonCredit implements Serializable {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    @Override
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -22,7 +22,8 @@ package com.omertron.themoviedbapi.model;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
@@ -35,7 +36,7 @@ public class PersonCrew implements Serializable {
    /*
     * Logger
     */
-    private static final Logger logger = Logger.getLogger(PersonCrew.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PersonCrew.class);
    /*
     * Properties
     */
@@ -105,7 +106,7 @@ public class PersonCrew implements Serializable {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    @Override
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -1,117 +1,118 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-@JsonRootName("production_company")
-public class ProductionCompany implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[ProductionCompany=");
-        sb.append("[id=").append(id);
-        sb.append("],[name=").append(name);
-        sb.append("]]");
-        return 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.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.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() {
+        StringBuilder sb = new StringBuilder("[ProductionCompany=");
+        sb.append("[id=").append(id);
+        sb.append("],[name=").append(name);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,117 +1,118 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-@JsonRootName("production_country")
-public class ProductionCountry implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[ProductionCountry=");
-        sb.append("[isoCode=").append(isoCode);
-        sb.append("],[name=").append(name);
-        sb.append("]]");
-        return 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.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.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() {
+        StringBuilder sb = new StringBuilder("[ProductionCountry=");
+        sb.append("[isoCode=").append(isoCode);
+        sb.append("],[name=").append(name);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,130 +1,131 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class ReleaseInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[ReleaseInfo=");
-        sb.append("[country=").append(country);
-        sb.append("],[certification=").append(certification);
-        sb.append("],[releaseDate=").append(releaseDate);
-        sb.append("]]");
-        return sb.toString();
-    }
-}
+/*
+ *      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.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() {
+        StringBuilder sb = new StringBuilder("[ReleaseInfo=");
+        sb.append("[country=").append(country);
+        sb.append("],[certification=").append(certification);
+        sb.append("],[releaseDate=").append(releaseDate);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -0,0 +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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class Reviews implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Logger
+     */
+    private static final Logger LOG = LoggerFactory.getLogger(Reviews.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("author")
+    private String author;
+    @JsonProperty("content")
+    private String content;
+    @JsonProperty("url")
+    private String url;
+
+    // <editor-fold defaultstate="collapsed" desc="Getter methods">
+    public String getId() {
+        return id;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+    // </editor-fold>
+
+    // <editor-fold defaultstate="collapsed" desc="Setter methods">
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    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());
+    }
+}
@@ -1,88 +1,89 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class StatusCode implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Status Code: ").append(statusCode);
-        sb.append(", Message: ").append(statusMessage);
-        return 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.model;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+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() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Status Code: ").append(statusCode);
+        sb.append(", Message: ").append(statusMessage);
+        return sb.toString();
+    }
+}
@@ -1,211 +1,207 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-public class TmdbConfiguration implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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
-     * @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));
-    }
-
-    /**
-     * 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("'");
-        logger.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder("[ImageConfiguration=");
-        sb.append("[baseUrl=").append(baseUrl);
-        sb.append("],[posterSizes=").append(posterSizes.toString());
-        sb.append("],[backdropSizes=").append(backdropSizes.toString());
-        sb.append("],[profileSizes=").append(profileSizes.toString());
-        sb.append("],[logoSizes=").append(logoSizes.toString());
-        sb.append(("]]"));
-        return sb.toString();
-    }
-}
+/*
+ *      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.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() {
+        StringBuilder sb = new StringBuilder("[ImageConfiguration=");
+        sb.append("[baseUrl=").append(baseUrl);
+        sb.append("],[posterSizes=").append(posterSizes.toString());
+        sb.append("],[backdropSizes=").append(backdropSizes.toString());
+        sb.append("],[profileSizes=").append(profileSizes.toString());
+        sb.append("],[logoSizes=").append(logoSizes.toString());
+        sb.append(("]]"));
+        return sb.toString();
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -21,13 +21,14 @@ package com.omertron.themoviedbapi.model;

 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 public class TokenAuthorisation {
    /*
     * Logger
     */
-    private static final Logger logger = Logger.getLogger(TokenAuthorisation.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TokenAuthorisation.class);
    /*
     * Properties
     */
@@ -77,7 +78,7 @@ public class TokenAuthorisation {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    @Override
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -21,13 +21,15 @@ package com.omertron.themoviedbapi.model;

 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 public class TokenSession {
    /*
     * Logger
     */
-    private static final Logger logger = Logger.getLogger(TokenSession.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(TokenSession.class);
    /*
     * Properties
     */
@@ -39,6 +41,10 @@ public class TokenSession {
    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() {
@@ -56,6 +62,14 @@ public class TokenSession {
    public String getStatusMessage() {
        return statusMessage;
    }
+
+    public String getGuestSessionId() {
+        return guestSessionId;
+    }
+
+    public String getExpiresAt() {
+        return expiresAt;
+    }
    // </editor-fold>

    // <editor-fold defaultstate="collapsed" desc="Setter methods">
@@ -74,6 +88,15 @@ public class TokenSession {
    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>

    /**
@@ -87,12 +110,11 @@ public class TokenSession {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    @Override
    public String toString() {
-        return "TokenSession{" + "sessionId=" + sessionId + ", success=" + success + ", statusCode=" + statusCode + ", statusMessage=" + statusMessage + '}';
+        return "TokenSession{" + "sessionId=" + sessionId + ", success=" + success + ", statusCode=" + statusCode + ", statusMessage=" + statusMessage + ", guestSessionId=" + guestSessionId + ", expiresAt=" + expiresAt + '}';
    }
-
 }
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -21,7 +21,8 @@ package com.omertron.themoviedbapi.model;

 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.io.Serializable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
@@ -34,7 +35,7 @@ public class Trailer implements Serializable {
    /*
     * Logger
     */
-    private static final Logger logger = Logger.getLogger(Trailer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Trailer.class);
    /*
     * Website sources
     */
@@ -95,7 +96,7 @@ public class Trailer implements Serializable {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }

    @Override
@@ -1,130 +1,131 @@
-/*
- *      Copyright (c) 2004-2012 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.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class Translation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.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("'");
-        logger.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() {
-        StringBuilder sb = new StringBuilder("[Translation=");
-        sb.append("[englishName=").append(englishName);
-        sb.append("],[isoCode=").append(isoCode);
-        sb.append("],[name=").append(name);
-        sb.append("]]");
-        return sb.toString();
-    }
-}
+/*
+ *      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.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() {
+        StringBuilder sb = new StringBuilder("[Translation=");
+        sb.append("[englishName=").append(englishName);
+        sb.append("],[isoCode=").append(isoCode);
+        sb.append("],[name=").append(name);
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,214 +1,251 @@
-/*
- *      Copyright (c) 2004-2012 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.TheMovieDbApi;
-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.log4j.Logger;
-
-/**
- * The API URL that is used to construct the API call
- *
- * @author Stuart
- */
-public class ApiUrl {
-
-    /*
-     * Logger
-     */
-    private static final Logger logger = Logger.getLogger(ApiUrl.class);
-    /*
-     * TheMovieDbApi API Base URL
-     */
-    private static final String TMDB_API_BASE = "http://api.themoviedb.org/3/";
-//    private static final String TMDB_API_BASE = "http://private-3aa3-themoviedb.apiary.io/3/";
-    /*
-     * Parameter configuration
-     */
-    private static final String DELIMITER_FIRST = "?";
-    private static final String DELIMITER_SUBSEQUENT = "&";
-    private static final String DEFAULT_STRING = "";
-    /*
-     * Properties
-     */
-    private TheMovieDbApi tmdb;
-    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_MOVIE_ID = "movie_id=";
-    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=";
-
-    //<editor-fold defaultstate="collapsed" desc="Constructor Methods">
-    /**
-     * Constructor for the simple API URL method without a sub-method
-     *
-     * @param method
-     */
-    public ApiUrl(TheMovieDbApi tmdb, String method) {
-        this.tmdb = tmdb;
-        this.method = method;
-        this.submethod = DEFAULT_STRING;
-    }
-
-    /**
-     * Constructor for the API URL with a sub-method
-     *
-     * @param method
-     * @param submethod
-     */
-    public ApiUrl(TheMovieDbApi tmdb, String method, String submethod) {
-        this.tmdb = tmdb;
-        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
-            urlString.append(submethod);
-
-            // Append the key information
-            urlString.append(DELIMITER_FIRST).append(PARAM_API_KEY);
-            urlString.append(tmdb.getApiKey());
-
-            // 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) {
-                logger.trace("Unable to encode query: '" + query + "' trying raw.");
-                // If we can't encode it, try it raw
-                urlString.append(query);
-            }
-
-            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
-            urlString.append(submethod);
-
-            // Append the key information
-            urlString.append(DELIMITER_FIRST).append(PARAM_API_KEY);
-            urlString.append(tmdb.getApiKey());
-        }
-
-        for (Map.Entry<String, String> argEntry : arguments.entrySet()) {
-            urlString.append(DELIMITER_SUBSEQUENT).append(argEntry.getKey());
-            urlString.append(argEntry.getValue());
-        }
-
-        try {
-            logger.trace("URL: " + urlString.toString());
-            return new URL(urlString.toString());
-        } catch (MalformedURLException ex) {
-            logger.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));
-    }
-
-    /**
-     * Clear the arguments
-     */
-    public void clearArguments() {
-        arguments.clear();
-    }
-
-    /**
-     * Set the arguments directly
-     *
-     * @param args
-     */
-    public void setArguments(Map<String, String> args) {
-        arguments.putAll(args);
-    }
-}
+/*
+ *      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=";
+    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());
+        }
+    }
+}
@@ -1,75 +0,0 @@
-/*
- *      Copyright (c) 2004-2012 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.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.spi.LoggingEvent;
-
-/**
- * Log4J Filtering routine to remove API keys from the output
- *
- * @author Stuart.Boston
- *
- */
-public class FilteringLayout extends PatternLayout {
-
-    private static final String REPLACEMENT = "[APIKEY]";
-    private static Pattern replacementPattern = Pattern.compile("DO_NOT_MATCH");
-
-    /**
-     * Add the string to replace in the log output
-     *
-     * @param replacementString
-     */
-    public static void addReplacementString(String replacementString) {
-        replacementPattern = Pattern.compile(replacementString);
-    }
-
-    /**
-     * Extend the format to remove the API_KEYS from the output
-     *
-     * @param event
-     * @return
-     */
-    @Override
-    public String format(LoggingEvent event) {
-        if (event.getMessage() instanceof String) {
-            String message = event.getRenderedMessage();
-
-            Matcher matcher = replacementPattern.matcher(message);
-            if (matcher.find()) {
-                String maskedMessage = matcher.replaceAll(REPLACEMENT);
-
-                Throwable throwable = event.getThrowableInformation() != null
-                        ? event.getThrowableInformation().getThrowable() : null;
-
-                LoggingEvent maskedEvent = new LoggingEvent(event.fqnOfCategoryClass,
-                        Logger.getLogger(event.getLoggerName()), event.timeStamp,
-                        event.getLevel(), maskedMessage, throwable);
-
-                return super.format(maskedEvent);
-            }
-        }
-        return super.format(event);
-    }
-}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -36,14 +36,15 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 * Web browser with simple cookies support
 */
 public final class WebBrowser {

-    private static final Logger logger = Logger.getLogger(WebBrowser.class);
+    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;
@@ -66,6 +67,7 @@ public final class WebBrowser {
    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");
        }
    }

@@ -133,7 +135,7 @@ public final class WebBrowser {
                try {
                    content.close();
                } catch (IOException ex) {
-                    logger.debug("Failed to close connection: " + ex.getMessage());
+                    LOG.debug("Failed to close connection: " + ex.getMessage());
                }
            }
        }
@@ -1,74 +1,76 @@
-/*
- *      Copyright (c) 2004-2012 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 com.omertron.themoviedbapi.model.AlternativeTitle;
-import java.util.List;
-import org.apache.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class WrapperAlternativeTitles {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperAlternativeTitles.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("titles")
-    private List<AlternativeTitle> titles;
-
-    public int getId() {
-        return id;
-    }
-
-    public List<AlternativeTitle> getTitles() {
-        return titles;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setTitles(List<AlternativeTitle> titles) {
-        this.titles = titles;
-    }
-
-    /**
-     * 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("'");
-        logger.trace(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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.AlternativeTitle;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class WrapperAlternativeTitles {
+    /*
+     * Logger
+     */
+
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperAlternativeTitles.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("titles")
+    private List<AlternativeTitle> titles;
+
+    public int getId() {
+        return id;
+    }
+
+    public List<AlternativeTitle> getTitles() {
+        return titles;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setTitles(List<AlternativeTitle> titles) {
+        this.titles = titles;
+    }
+
+    /**
+     * 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());
+    }
+}
@@ -0,0 +1,102 @@
+/*
+ *      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 org.slf4j.Logger;
+
+/**
+ * Base class for the wrappers
+ *
+ * @author Stuart
+ */
+public class WrapperBase {
+    /*
+     * Logger - set by the sub-classes
+     */
+
+    private Logger log;
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("page")
+    private int page;
+    @JsonProperty("total_pages")
+    private int totalPages;
+    @JsonProperty("total_results")
+    private int totalResults;
+
+    public WrapperBase(Logger logger) {
+        this.log = logger;
+    }
+
+    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
+    public int getId() {
+        return id;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public int getTotalPages() {
+        return totalPages;
+    }
+
+    public int getTotalResults() {
+        return totalResults;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public void setTotalPages(int totalPages) {
+        this.totalPages = totalPages;
+    }
+
+    public void setTotalResults(int totalResults) {
+        this.totalResults = totalResults;
+    }
+    //</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());
+    }
+}
@@ -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, 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 com.omertron.themoviedbapi.model.MovieChanges;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author stuart.boston
+ */
+public class WrapperChanges {
+    /*
+     * Logger
+     */
+
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperChanges.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("changes")
+    private List<MovieChanges> changes;
+
+    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    public List<MovieChanges> getChanges() {
+        return changes;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setter methods">
+    public void setChanges(List<MovieChanges> changes) {
+        this.changes = changes;
+    }
+    //</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());
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ *      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;
+import com.omertron.themoviedbapi.model.Collection;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author stuart.boston
+ */
+public class WrapperCollection extends WrapperBase {
+    /*
+     * Properties
+     */
+
+    @JsonProperty("results")
+    private List<Collection> results;
+
+    public WrapperCollection() {
+        super(LoggerFactory.getLogger(WrapperCollection.class));
+    }
+
+    public List<Collection> getResults() {
+        return results;
+    }
+
+    public void setResults(List<Collection> results) {
+        this.results = results;
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -19,80 +19,32 @@
 */
 package com.omertron.themoviedbapi.wrapper;

-import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Company;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
 * @author stuart.boston
 */
-public class WrapperCompany {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperCompany.class);
+public class WrapperCompany extends WrapperBase {
    /*
     * Properties
     */
-    @JsonProperty("page")
-    private int page;
+
    @JsonProperty("results")
    private List<Company> results;
-    @JsonProperty("total_pages")
-    private int totalPages;
-    @JsonProperty("total_results")
-    private int totalResults;

-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getPage() {
-        return page;
+    public WrapperCompany() {
+        super(LoggerFactory.getLogger(WrapperCompany.class));
    }

    public List<Company> getResults() {
        return results;
    }

-    public int getTotalPages() {
-        return totalPages;
-    }
-
-    public int getTotalResults() {
-        return totalResults;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setPage(int page) {
-        this.page = page;
-    }
-
    public void setResults(List<Company> results) {
        this.results = results;
    }
-
-    public void setTotalPages(int totalPages) {
-        this.totalPages = totalPages;
-    }
-
-    public void setTotalResults(int totalResults) {
-        this.totalResults = totalResults;
-    }
-    //</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("'");
-        logger.trace(sb.toString());
-    }
 }
@@ -1,117 +1,62 @@
-/*
- *      Copyright (c) 2004-2012 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 com.omertron.themoviedbapi.model.MovieDb;
-import java.util.List;
-import org.apache.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-public class WrapperCompanyMovies {
-    // Loggers
-    private static final Logger logger = Logger.getLogger(WrapperCompanyMovies.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int companyId;
-    @JsonProperty("page")
-    private int page;
-    @JsonProperty("results")
-    private List<MovieDb> results;
-    @JsonProperty("total_pages")
-    private int totalPages;
-    @JsonProperty("total_results")
-    private int totalResults;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getCompanyId() {
-        return companyId;
-    }
-
-    public int getPage() {
-        return page;
-    }
-
-    public List<MovieDb> getResults() {
-        return results;
-    }
-
-    public int getTotalPages() {
-        return totalPages;
-    }
-
-    public int getTotalResults() {
-        return totalResults;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setCompanyId(int companyId) {
-        this.companyId = companyId;
-    }
-
-    public void setPage(int page) {
-        this.page = page;
-    }
-
-    public void setResults(List<MovieDb> results) {
-        this.results = results;
-    }
-
-    public void setTotalPages(int totalPages) {
-        this.totalPages = totalPages;
-    }
-
-    public void setTotalResults(int totalResults) {
-        this.totalResults = totalResults;
-    }
-    //</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("'");
-        logger.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder("[ResultList=[");
-        sb.append("[companyId=").append(companyId);
-        sb.append("],[page=").append(page);
-        sb.append("],[pageResults=").append(results.size());
-        sb.append("],[totalPages=").append(totalPages);
-        sb.append("],[totalResults=").append(totalResults);
-        sb.append("]]");
-        return 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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.MovieDb;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author stuart.boston
+ */
+public class WrapperCompanyMovies extends WrapperBase {
+    /*
+     * Properties
+     */
+
+    @JsonProperty("results")
+    private List<MovieDb> results;
+
+    public WrapperCompanyMovies() {
+        super(LoggerFactory.getLogger(WrapperCompanyMovies.class));
+    }
+
+    public List<MovieDb> getResults() {
+        return results;
+    }
+
+    public void setResults(List<MovieDb> results) {
+        this.results = results;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder("[ResultList=[");
+        sb.append("[companyId=").append(getId());
+        sb.append("],[page=").append(getPage());
+        sb.append("],[pageResults=").append(getResults().size());
+        sb.append("],[totalPages=").append(getTotalPages());
+        sb.append("],[totalResults=").append(getTotalResults());
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -24,7 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.TmdbConfiguration;
 import java.util.Collections;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
@@ -35,7 +36,7 @@ public class WrapperConfig {
     * Logger
     */

-    private static final Logger logger = Logger.getLogger(WrapperConfig.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperConfig.class);
    /*
     * Properties
     */
@@ -71,6 +72,6 @@ public class WrapperConfig {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }
 }
@@ -1,66 +1,67 @@
-/*
- *      Copyright (c) 2004-2012 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 com.omertron.themoviedbapi.model.Genre;
-import java.util.List;
-import org.apache.log4j.Logger;
-
-/**
- * Wrapper class for the Genres searches
- *
- * @author Stuart
- */
-public class WrapperGenres {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperGenres.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("genres")
-    private List<Genre> genres;
-
-    public List<Genre> getGenres() {
-        return genres;
-    }
-
-    public void setGenres(List<Genre> genres) {
-        this.genres = genres;
-    }
-
-    /**
-     * 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("'");
-        logger.trace(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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.Genre;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Wrapper class for the Genres searches
+ *
+ * @author Stuart
+ */
+public class WrapperGenres {
+    /*
+     * Logger
+     */
+
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperGenres.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("genres")
+    private List<Genre> genres;
+
+    public List<Genre> getGenres() {
+        return genres;
+    }
+
+    public void setGenres(List<Genre> genres) {
+        this.genres = genres;
+    }
+
+    /**
+     * 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());
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -19,39 +19,36 @@
 */
 package com.omertron.themoviedbapi.wrapper;

-import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Artwork;
+import com.omertron.themoviedbapi.model.ArtworkType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
 * @author Stuart
 */
-public class WrapperImages {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperImages.class);
+public class WrapperImages extends WrapperBase {
    /*
     * Properties
     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("backdrops")
-    private List<Artwork> backdrops;
-    @JsonProperty("posters")
-    private List<Artwork> posters;
-    @JsonProperty("profiles")
-    private List<Artwork> profiles;

-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getId() {
-        return id;
+    @JsonProperty("backdrops")
+    private List<Artwork> backdrops = Collections.EMPTY_LIST;
+    @JsonProperty("posters")
+    private List<Artwork> posters = Collections.EMPTY_LIST;
+    @JsonProperty("profiles")
+    private List<Artwork> profiles = Collections.EMPTY_LIST;
+
+    public WrapperImages() {
+        super(LoggerFactory.getLogger(WrapperImages.class));
    }

+    //<editor-fold defaultstate="collapsed" desc="Getter methods">
    public List<Artwork> getBackdrops() {
        return backdrops;
    }
@@ -66,10 +63,6 @@ public class WrapperImages {
    //</editor-fold>

    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setId(int id) {
-        this.id = id;
-    }
-
    public void setBackdrops(List<Artwork> backdrops) {
        this.backdrops = backdrops;
    }
@@ -84,16 +77,46 @@ public class WrapperImages {
    //</editor-fold>

    /**
-     * Handle unknown properties and print a message
+     * Return a list of all the artwork with their types.
     *
-     * @param key
-     * @param value
+     * Leaving the parameters blank will return all types
+     *
+     * @return
     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+    public List<Artwork> getAll(ArtworkType... artworkList) {
+        List<Artwork> artwork = new ArrayList<Artwork>();
+        List<ArtworkType> types;
+
+        if (artworkList.length > 0) {
+            types = new ArrayList<ArtworkType>(Arrays.asList(artworkList));
+        } else {
+            types = new ArrayList<ArtworkType>(Arrays.asList(ArtworkType.values()));
+        }
+
+        if (types.contains(ArtworkType.POSTER)) {
+            // Add all the posters to the list
+            for (Artwork poster : posters) {
+                poster.setArtworkType(ArtworkType.POSTER);
+                artwork.add(poster);
+            }
+        }
+
+        if (types.contains(ArtworkType.BACKDROP)) {
+            // Add all the backdrops to the list
+            for (Artwork backdrop : backdrops) {
+                backdrop.setArtworkType(ArtworkType.BACKDROP);
+                artwork.add(backdrop);
+            }
+        }
+
+        if (types.contains(ArtworkType.PROFILE)) {
+            // Add all the backdrops to the list
+            for (Artwork backdrop : profiles) {
+                backdrop.setArtworkType(ArtworkType.PROFILE);
+                artwork.add(backdrop);
+            }
+        }
+
+        return artwork;
    }
 }
@@ -0,0 +1,63 @@
+/*
+ *      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 com.omertron.themoviedbapi.model.AlternativeTitle;
+import com.omertron.themoviedbapi.model.JobDepartment;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class WrapperJobList {
+
+    // Logger
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperJobList.class);
+    // Properties
+    @JsonProperty("jobs")
+    private List<JobDepartment> jobs;
+
+    public List<JobDepartment> getJobs() {
+        return jobs;
+    }
+
+    public void setJobs(List<JobDepartment> jobs) {
+        this.jobs = jobs;
+    }
+
+    /**
+     * 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());
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ *      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;
+import com.omertron.themoviedbapi.model.KeywordMovie;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author stuart.boston
+ */
+public class WrapperKeywordMovies extends WrapperBase {
+    /*
+     * Properties
+     */
+
+    @JsonProperty("results")
+    private List<KeywordMovie> results;
+
+    public WrapperKeywordMovies() {
+        super(LoggerFactory.getLogger(WrapperKeywordMovies.class));
+    }
+
+    public List<KeywordMovie> getResults() {
+        return results;
+    }
+
+    public void setResults(List<KeywordMovie> results) {
+        this.results = results;
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ *      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;
+import com.omertron.themoviedbapi.model.Keyword;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author stuart.boston
+ */
+public class WrapperKeywords extends WrapperBase {
+    /*
+     * Properties
+     */
+
+    @JsonProperty("results")
+    private List<Keyword> results;
+
+    public WrapperKeywords() {
+        super(LoggerFactory.getLogger(WrapperKeywords.class));
+    }
+
+    public List<Keyword> getResults() {
+        return results;
+    }
+
+    public void setResults(List<Keyword> results) {
+        this.results = results;
+    }
+}
@@ -1,121 +1,62 @@
-/*
- *      Copyright (c) 2004-2012 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 com.omertron.themoviedbapi.model.MovieDb;
-import java.util.List;
-import org.apache.log4j.Logger;
-
-/**
- *
- * @author stuart.boston
- */
-public class WrapperMovie {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperMovie.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("page")
-    private int page;
-    @JsonProperty("results")
-    private List<MovieDb> movies;
-    @JsonProperty("total_pages")
-    private int totalPages;
-    @JsonProperty("total_results")
-    private int totalResults;
-    @JsonProperty("id")
-    private int id;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getPage() {
-        return page;
-    }
-
-    public List<MovieDb> getMovies() {
-        return movies;
-    }
-
-    public int getTotalPages() {
-        return totalPages;
-    }
-
-    public int getTotalResults() {
-        return totalResults;
-    }
-
-    public int getId() {
-        return id;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setPage(int page) {
-        this.page = page;
-    }
-
-    public void setMovies(List<MovieDb> results) {
-        this.movies = results;
-    }
-
-    public void setTotalPages(int totalPages) {
-        this.totalPages = totalPages;
-    }
-
-    public void setTotalResults(int totalResults) {
-        this.totalResults = totalResults;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-    //</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("'");
-        logger.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder("[ResultList=[");
-        sb.append("[page=").append(page);
-        sb.append("],[pageResults=").append(movies.size());
-        sb.append("],[totalPages=").append(totalPages);
-        sb.append("],[totalResults=").append(totalResults);
-        sb.append("],[id=").append(id);
-        sb.append("]]");
-        return 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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.MovieDb;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author stuart.boston
+ */
+public class WrapperMovie extends WrapperBase {
+    /*
+     * Properties
+     */
+
+    @JsonProperty("results")
+    private List<MovieDb> movies;
+
+    public WrapperMovie() {
+        super(LoggerFactory.getLogger(WrapperMovie.class));
+    }
+
+    public List<MovieDb> getMovies() {
+        return movies;
+    }
+
+    public void setMovies(List<MovieDb> movies) {
+        this.movies = movies;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder("[ResultList=[");
+        sb.append("[page=").append(getPage());
+        sb.append("],[pageResults=").append(getMovies().size());
+        sb.append("],[totalPages=").append(getTotalPages());
+        sb.append("],[totalResults=").append(getTotalResults());
+        sb.append("],[id=").append(getId());
+        sb.append("]]");
+        return sb.toString();
+    }
+}
@@ -1,89 +1,91 @@
-/*
- *      Copyright (c) 2004-2012 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 com.omertron.themoviedbapi.model.PersonCast;
-import com.omertron.themoviedbapi.model.PersonCrew;
-import java.util.List;
-import org.apache.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class WrapperMovieCasts {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperMovieCasts.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("cast")
-    private List<PersonCast> cast;
-    @JsonProperty("crew")
-    private List<PersonCrew> crew;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public List<PersonCast> getCast() {
-        return cast;
-    }
-
-    public List<PersonCrew> getCrew() {
-        return crew;
-    }
-
-    public int getId() {
-        return id;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setCast(List<PersonCast> cast) {
-        this.cast = cast;
-    }
-
-    public void setCrew(List<PersonCrew> crew) {
-        this.crew = crew;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-    //</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("'");
-        logger.trace(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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.PersonCast;
+import com.omertron.themoviedbapi.model.PersonCrew;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class WrapperMovieCasts {
+    /*
+     * Logger
+     */
+
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperMovieCasts.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("cast")
+    private List<PersonCast> cast;
+    @JsonProperty("crew")
+    private List<PersonCrew> crew;
+
+    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    public List<PersonCast> getCast() {
+        return cast;
+    }
+
+    public List<PersonCrew> getCrew() {
+        return crew;
+    }
+
+    public int getId() {
+        return id;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setter methods">
+    public void setCast(List<PersonCast> cast) {
+        this.cast = cast;
+    }
+
+    public void setCrew(List<PersonCrew> crew) {
+        this.crew = crew;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+    //</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());
+    }
+}
@@ -1,78 +1,80 @@
-/*
- *      Copyright (c) 2004-2012 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 com.omertron.themoviedbapi.model.Keyword;
-import java.util.List;
-import org.apache.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class WrapperMovieKeywords {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperMovieKeywords.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("keywords")
-    private List<Keyword> keywords;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getId() {
-        return id;
-    }
-
-    public List<Keyword> getKeywords() {
-        return keywords;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setKeywords(List<Keyword> keywords) {
-        this.keywords = keywords;
-    }
-    //</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("'");
-        logger.trace(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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.Keyword;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class WrapperMovieKeywords {
+    /*
+     * Logger
+     */
+
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperMovieKeywords.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("keywords")
+    private List<Keyword> keywords;
+
+    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    public int getId() {
+        return id;
+    }
+
+    public List<Keyword> getKeywords() {
+        return keywords;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setter methods">
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setKeywords(List<Keyword> keywords) {
+        this.keywords = keywords;
+    }
+    //</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());
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ *      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;
+import com.omertron.themoviedbapi.model.MovieList;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class WrapperMovieList extends WrapperBase {
+    /*
+     * Properties
+     */
+
+    @JsonProperty("results")
+    private List<MovieList> movieList;
+
+    public WrapperMovieList() {
+        super(LoggerFactory.getLogger(WrapperMovieList.class));
+    }
+
+    public List<MovieList> getMovieList() {
+        return movieList;
+    }
+
+    public void setMovieList(List<MovieList> movieList) {
+        this.movieList = movieList;
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -19,80 +19,32 @@
 */
 package com.omertron.themoviedbapi.wrapper;

-import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Person;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
 * @author stuart.boston
 */
-public class WrapperPerson {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperPerson.class);
+public class WrapperPerson extends WrapperBase {
    /*
     * Properties
     */
-    @JsonProperty("page")
-    private int page;
+
    @JsonProperty("results")
    private List<Person> results;
-    @JsonProperty("total_pages")
-    private int totalPages;
-    @JsonProperty("total_results")
-    private int totalResults;

-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getPage() {
-        return page;
+    public WrapperPerson() {
+        super(LoggerFactory.getLogger(WrapperPerson.class));
    }

    public List<Person> getResults() {
        return results;
    }

-    public int getTotalPages() {
-        return totalPages;
-    }
-
-    public int getTotalResults() {
-        return totalResults;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setPage(int page) {
-        this.page = page;
-    }
-
    public void setResults(List<Person> results) {
        this.results = results;
    }
-
-    public void setTotalPages(int totalPages) {
-        this.totalPages = totalPages;
-    }
-
-    public void setTotalResults(int totalResults) {
-        this.totalResults = totalResults;
-    }
-    //</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("'");
-        logger.trace(sb.toString());
-    }
 }
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -19,70 +19,42 @@
 */
 package com.omertron.themoviedbapi.wrapper;

-import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.PersonCredit;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
 * @author stuart.boston
 */
-public class WrapperPersonCredits {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperMovieCasts.class);
+public class WrapperPersonCredits extends WrapperBase {
    /*
     * Properties
     */
-    @JsonProperty("id")
-    private int id;
+
    @JsonProperty("cast")
    private List<PersonCredit> cast;
    @JsonProperty("crew")
    private List<PersonCredit> crew;

-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    public WrapperPersonCredits() {
+        super(LoggerFactory.getLogger(WrapperMovieCasts.class));
+    }
+
    public List<PersonCredit> getCast() {
        return cast;
    }

+    public void setCast(List<PersonCredit> cast) {
+        this.cast = cast;
+    }
+
    public List<PersonCredit> getCrew() {
        return crew;
    }

-    public int getId() {
-        return id;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setCast(List<PersonCredit> cast) {
-        this.cast = cast;
-    }
-
    public void setCrew(List<PersonCredit> crew) {
        this.crew = crew;
    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-    //</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("'");
-        logger.trace(sb.toString());
-    }
 }
@@ -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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.MovieList;
+import com.omertron.themoviedbapi.model.Person;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class WrapperPersonList extends WrapperBase {
+    /*
+     * Properties
+     */
+
+    @JsonProperty("results")
+    private List<Person> personList;
+
+    public WrapperPersonList() {
+        super(LoggerFactory.getLogger(WrapperPersonList.class));
+    }
+
+    public List<Person> getPersonList() {
+        return personList;
+    }
+
+    public void setPersonList(List<Person> personList) {
+        this.personList = personList;
+    }
+}
@@ -1,78 +1,80 @@
-/*
- *      Copyright (c) 2004-2012 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 com.omertron.themoviedbapi.model.ReleaseInfo;
-import java.util.List;
-import org.apache.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class WrapperReleaseInfo {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperReleaseInfo.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("countries")
-    private List<ReleaseInfo> countries;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public List<ReleaseInfo> getCountries() {
-        return countries;
-    }
-
-    public int getId() {
-        return id;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setCountries(List<ReleaseInfo> countries) {
-        this.countries = countries;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-    //</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("'");
-        logger.trace(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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.ReleaseInfo;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class WrapperReleaseInfo {
+    /*
+     * Logger
+     */
+
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperReleaseInfo.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("countries")
+    private List<ReleaseInfo> countries;
+
+    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    public List<ReleaseInfo> getCountries() {
+        return countries;
+    }
+
+    public int getId() {
+        return id;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Setter methods">
+    public void setCountries(List<ReleaseInfo> countries) {
+        this.countries = countries;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+    //</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());
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ *      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;
+import com.omertron.themoviedbapi.model.Reviews;
+import java.util.List;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author stuart.boston
+ */
+public class WrapperReviews extends WrapperBase {
+    /*
+     * Properties
+     */
+
+    @JsonProperty("results")
+    private List<Reviews> reviews;
+
+    public WrapperReviews() {
+        super(LoggerFactory.getLogger(WrapperReviews.class));
+    }
+
+    public List<Reviews> getReviews() {
+        return reviews;
+    }
+
+    public void setReviews(List<Reviews> reviews) {
+        this.reviews = reviews;
+    }
+}
@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2012 Stuart Boston
+ *      Copyright (c) 2004-2013 Stuart Boston
 *
 *      This file is part of TheMovieDB API.
 *
@@ -22,8 +22,10 @@ package com.omertron.themoviedbapi.wrapper;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Trailer;
+import java.util.ArrayList;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 *
@@ -34,7 +36,7 @@ public class WrapperTrailers {
     * Logger
     */

-    private static final Logger logger = Logger.getLogger(WrapperTrailers.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperTrailers.class);
    /*
     * Properties
     */
@@ -73,8 +75,30 @@ public class WrapperTrailers {
    }
    //</editor-fold>

+    /**
+     * Get a combined list of the trailers with their source website
+     * @return
+     */
+    public List<Trailer> getAll() {
+        List<Trailer> trailers = new ArrayList<Trailer>();
+
+        // Add the trailer to the return list along with it's source
+        for (Trailer trailer : quicktime) {
+            trailer.setWebsite(Trailer.WEBSITE_QUICKTIME);
+            trailers.add(trailer);
+        }
+        // Add the trailer to the return list along with it's source
+        for (Trailer trailer : youtube) {
+            trailer.setWebsite(Trailer.WEBSITE_YOUTUBE);
+            trailers.add(trailer);
+        }
+
+        return trailers;
+    }
+
    /**
     * Handle unknown properties and print a message
+     *
     * @param key
     * @param value
     */
@@ -83,6 +107,6 @@ public class WrapperTrailers {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        logger.trace(sb.toString());
+        LOG.trace(sb.toString());
    }
 }
@@ -1,75 +1,80 @@
-/*
- *      Copyright (c) 2004-2012 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.omertron.themoviedbapi.model.Translation;
-import java.util.List;
-import org.apache.log4j.Logger;
-
-/**
- *
- * @author Stuart
- */
-public class WrapperTranslations {
-    /*
-     * Logger
-     */
-
-    private static final Logger logger = Logger.getLogger(WrapperTranslations.class);
-    /*
-     * Properties
-     */
-    private int id;
-    private List<Translation> translations;
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setTranslations(List<Translation> translations) {
-        this.translations = translations;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getId() {
-        return id;
-    }
-
-    public List<Translation> getTranslations() {
-        return translations;
-    }
-    //</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("'");
-        logger.trace(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.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.Translation;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Stuart
+ */
+public class WrapperTranslations {
+    /*
+     * Logger
+     */
+
+    private static final Logger LOG = LoggerFactory.getLogger(WrapperTranslations.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("translations")
+    private List<Translation> translations;
+
+    //<editor-fold defaultstate="collapsed" desc="Setter methods">
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setTranslations(List<Translation> translations) {
+        this.translations = translations;
+    }
+    //</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    public int getId() {
+        return id;
+    }
+
+    public List<Translation> getTranslations() {
+        return translations;
+    }
+    //</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());
+    }
+}
@@ -1,39 +1,39 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  	<id>bin</id>
-  	<formats>
-    	<format>${distribution.format}</format>
-  	</formats>
-  	<includeBaseDirectory>false</includeBaseDirectory>
-  	<fileSets>
-    	<!-- add version.txt file -->
-    	<fileSet>
-      		<directory>${project.build.directory}</directory>
-      		<outputDirectory></outputDirectory>
-      		<includes>
-        		<include>version.txt</include>
-      		</includes>
-    	</fileSet>
-    	
-    	<!-- add readme.txt file -->
-    	<fileSet>
-      		<directory>${basedir}</directory>
-      		<outputDirectory></outputDirectory>
-      		<includes>
-        		<include>readme.txt</include>
-      		</includes>
-    	</fileSet>
-    	
-    	<!-- add jar files -->
-    	<fileSet>
-      		<directory>${project.build.directory}</directory>
-      		<outputDirectory></outputDirectory>
-      		<includes>
-        		<include>**/*.jar</include>
-      		</includes>
-    	</fileSet>
-    	
-  	</fileSets>
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>bin</id>
+    <formats>
+        <format>${distribution.format}</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <!-- add version.txt file -->
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>version.txt</include>
+            </includes>
+        </fileSet>
+
+        <!-- add readme.txt file -->
+        <fileSet>
+            <directory>${basedir}</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>README.md</include>
+            </includes>
+        </fileSet>
+
+        <!-- add jar files -->
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>**/*.jar</include>
+            </includes>
+        </fileSet>
+
+    </fileSets>

 </assembly>
@@ -1,7 +0,0 @@
-log4j.rootLogger=DEBUG, CONSOLE
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=com.omertron.themoviedbapi.tools.FilteringLayout
-#log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[TheMovieDB API-%C{1}] %m%n
-#log4j.appender.CONSOLE.Threshold=DEBUG
-log4j.appender.CONSOLE.Encoding=UTF-8
@@ -0,0 +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");
+    }
+}
Author	SHA1	Message	Date
Omertron	7900b6d25b	[maven-release-plugin] prepare release themoviedbapi-3.5	2013-05-15 20:34:15 +02:00
Omertron	4747c42fc6	Updated POM versions	2013-05-15 20:31:44 +02:00
Stuart Boston	1a96343924	Updated Test class	2013-05-15 18:15:12 +01:00
Stuart Boston	76191c13c0	Add overview to CollectionInfo	2013-05-15 18:14:54 +01:00
Stuart Boston	ce533c2b41	removed unused log messages in test class	2013-05-15 18:06:54 +01:00
Stuart Boston	de623ff0db	Add discover method	2013-05-15 16:24:57 +01:00
Stuart Boston	6745f5f3d5	Fix issue with WrapperImages not having initialised collections	2013-05-15 14:16:15 +01:00
Stuart Boston	955ef0369e	Add Job List	2013-05-15 14:09:57 +01:00
Stuart Boston	4c682731b6	Add PopularPerson method	2013-05-15 13:46:59 +01:00
Stuart Boston	c99f60f636	Un"ignored" the tests	2013-05-15 13:22:06 +01:00
Stuart Boston	265878d016	Added AppendToResponse for MovieDb (MovieInfo methods)	2013-05-15 13:19:02 +01:00
Stuart Boston	9bf7175ee8	Add "getAll" method to Images and Trailers	2013-05-15 13:18:14 +01:00
Stuart Boston	00063cc85d	Add reviews	2013-05-15 13:16:44 +01:00
Stuart Boston	2f7468914c	Allow AppendToReponse to contain multiple elements	2013-05-15 11:51:20 +01:00
Stuart Boston	4d9d53421f	Add placeholder "append_to_response" parameters	2013-05-14 16:20:27 +01:00
Stuart Boston	9f135c3ca7	Removed reliance on MovieDb object from ApiBuilder	2013-05-14 16:01:25 +01:00
Stuart Boston	7d9552a08c	Updated bin.xml to add correct README	2013-04-19 10:03:42 +01:00
Stuart Boston	3acf07b36a	Non-functional changes to POM and bin.xml	2013-04-19 09:35:09 +01:00
Stuart Boston	f501126b76	Reverted build version to 1.6	2013-04-03 15:05:45 +01:00
Stuart Boston	8ab8699dd5	updated version.txt	2013-03-25 22:08:40 +00:00
Stuart Boston	6c4ba2a492	Updated version.txt	2013-03-25 21:49:50 +00:00
Stuart Boston	44df73f2d1	Updated POM versions and build number	2013-03-25 20:57:44 +00:00
Omertron	98a1b5d1b9	[maven-release-plugin] prepare for next development iteration	2013-03-18 13:45:57 +01:00
Omertron	4c2463b14a	[maven-release-plugin] prepare release themoviedbapi-3.4	2013-03-18 13:45:45 +01:00
Omertron	7de82cdba8	Updated POM versions	2013-03-18 13:42:56 +01:00
Stuart Boston	bf8730c1ee	Updated test case for getGenreMovies	2013-03-18 12:37:24 +00:00
Stuart Boston	3085018cf0	Added "Include All Movies" to getGenreMovies Old method will be deprecated at some point	2013-03-18 12:36:26 +00:00
Stuart Boston	d2972ac927	Added IMDB_ID and POPULARITY to Person	2013-03-07 15:32:10 +00:00
Stuart Boston	bea972520b	Removed unused imports	2013-02-27 08:54:52 +00:00
Stuart Boston	e17db7a15b	Tidied up test class	2013-02-25 12:56:09 +00:00
Stuart Boston	9e6a290f63	Added English literal to test cases	2013-02-25 09:32:03 +00:00
Stuart Boston	9e9f0b5c9e	Optimised logging output	2013-02-25 08:57:26 +00:00
Stuart Boston	03c6e1917a	Added Russian literal	2013-02-25 08:46:52 +00:00
Stuart Boston	a0fca9e69a	Fixed Russian test name	2013-02-25 08:45:54 +00:00
Stuart Boston	40567c3059	Added example Jackson Replacement code	2013-02-25 08:41:24 +00:00
Stuart Boston	160b478c11	Updated LOG messages	2013-02-25 08:30:14 +00:00
Stuart Boston	de67805b0c	Updated README with logging information	2013-02-24 19:52:57 +00:00
Omertron	1b62ae2ff8	Removed Log4J dependency and switched to SLF4J	2013-02-24 18:58:27 +00:00
Stuart Boston	618406b459	Removed unused imports	2013-02-04 16:15:10 +00:00
Stuart Boston	a7498c5c69	Removed unnecessary locals	2013-02-04 16:04:47 +00:00
Omertron	f177026261	Added keyword searches	2013-02-03 21:09:41 +00:00
Omertron	1e45b87508	Refactored to use a base class	2013-02-03 19:25:23 +00:00
Omertron	596cde7621	Removed Apiary URL	2013-02-03 19:24:46 +00:00
Omertron	857071676b	Updated test cases	2013-02-03 10:51:22 +00:00
Omertron	c275e71ab4	Added Keyword and List functions	2013-02-02 15:49:23 +00:00
Omertron	f27f6f35fe	Updated Javadoc	2013-01-29 21:05:12 +00:00
Omertron	47faecc207	Updated exception details	2013-01-29 20:48:50 +00:00
Omertron	deb9eb6642	Renamed log4j properties file	2013-01-29 20:42:14 +00:00
Stuart Boston	d3af326a77	removed blank @return's from javadoc	2013-01-28 21:05:10 +00:00
Stuart Boston	1d91a557eb	Updated POM Versions	2013-01-28 14:48:55 +00:00
Stuart Boston	e59f724466	Updated README	2013-01-28 13:47:05 +00:00
Stuart Boston	ff93629ae8	Updated POM	2013-01-28 13:19:56 +00:00
Stuart Boston	50488f98b7	Added automatic site documentation to POM	2013-01-28 13:16:33 +00:00
Omertron	505b8c06dc	Removed revision line from version.txt	2013-01-14 20:15:20 +00:00
Omertron	0f8731ffe5	Added accept for JSON to WebBrowser	2013-01-14 19:52:07 +00:00
Omertron	3029bf4086	Updated copyright date	2013-01-01 07:28:38 +00:00
Omertron	55b9760c34	Updated test cases	2012-12-27 21:50:48 +00:00
Omertron	7034be4681	Added keyword search	2012-12-27 21:50:28 +00:00
Omertron	44d63fbf76	Added new searches	2012-12-24 22:35:31 +00:00
Stuart Boston	1009e2598e	Removed test for authentication as requires a HTTP session	2012-12-20 12:46:57 +00:00
Omertron	44a60ba786	Add get person latest method	2012-12-19 21:46:37 +00:00
Stuart Boston	af0b657586	Remove deprecated functions	2012-12-19 16:00:57 +00:00
Stuart Boston	46cd35f908	Added getMovieChanges method	2012-12-19 15:56:45 +00:00
Stuart Boston	608c0a9b05	Added getMovieLists method	2012-12-18 16:07:10 +00:00
Stuart Boston	902db42094	Added Get Guest Session method	2012-12-18 15:29:05 +00:00
Omertron	e7ec580ea2	Add Levenshtein Difference for movie compare	2012-12-17 22:03:12 +00:00
Omertron	1605a71528	[maven-release-plugin] prepare for next development iteration	2012-12-17 13:51:03 +01:00