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

Fixes #28

.gitattributes

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

.gitignore

@@ -1,9 +1,14 @@
 *.class
-
 # Package Files #
 *.jar
 *.war
 *.ear
-
+*.bin
 /target/
 /nbactions.xml
+testing.properties
+*.bin
+.settings
+.classpath
+.project
+.DS_Store

JacksonReplacement/JsonProperty.java

@@ -8,5 +8,6 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface JsonProperty {
-	String value() default "";
+
+    String value() default "";
 }

JacksonReplacement/JsonRootName.java

@@ -8,5 +8,5 @@ import java.lang.annotation.Target;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface JsonRootName {
-	String value() default "";
+    String value() default "";
 }

JacksonReplacement/ObjectMapper.java

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

README.md

@@ -5,9 +5,20 @@ Author: Stuart Boston (Omertron AT Gmail DOT com)
 
 This API uses the [TheMovieDB.org API](http://api.themoviedb.org/)
 
-Originally written for use by Yet Another Movie Jukebox [(YAMJ)](http://code.google.com/p/moviejukebox/)
+Originally written for use by YetAnotherMovieJukebox ([YAMJv2](https://github.com/YAMJ/yamj-v2) & [YAMJv3](https://github.com/YAMJ/yamj-v3)), but anyone can feel free to use it for other projects as well.
+
+[![Build Status](http://jenkins.omertron.com/job/API-TheMovieDb/badge/icon)](http://jenkins.omertron.com/job/API-TheMovieDb)
+
+***
+
+TMDB TV Support
+===============
+
+Release 4.0 of the API now includes TV shows.
+
+This has resulted in a complete re-write of the API and many of the methods and models have been re-written to support the new TV calls.
+
 
-But anyone can use it for other projects as well.
 ***
 ### TheMovieDB.org
 This is an excellent open database for movie and film content.

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
-        <version>7</version>
+        <version>9</version>
     </parent>
 
     <prerequisites>
@@ -13,7 +13,7 @@
 
     <groupId>com.omertron</groupId>
     <artifactId>themoviedbapi</artifactId>
-    <version>3.7</version>
+    <version>4.1</version>
     <packaging>jar</packaging>
 
     <name>API-The MovieDB</name>
@@ -71,6 +71,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <distribution.format>zip</distribution.format>
+        <version.jackson>2.6.3</version.jackson>
+        <version.slf4j>1.7.12</version.slf4j>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyy-MM-dd-HHmm</maven.build.timestamp.format>
     </properties>
 
     <dependencies>
@@ -78,248 +84,57 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <!--JSON-->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.2.3</version>
+            <version>${version.jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.2.3</version>
+            <version>${version.jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.2.3</version>
+            <version>${version.jackson}</version>
         </dependency>
         <!--LOGGING-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
+            <version>${version.slf4j}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.5</version>
+            <version>${version.slf4j}</version>
             <scope>test</scope>
         </dependency>
         <!--COMMON HTTP TOOLS-->
         <dependency>
             <groupId>org.yamj</groupId>
             <artifactId>api-common</artifactId>
-            <version>1.0</version>
+            <version>2.0</version>
+        </dependency>
+        <!-- Apache Utils -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</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.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>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.14.1</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.3</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>
@@ -348,4 +163,200 @@
         </profile>
     </profiles>
 
+    <build>
+        <finalName>${project.artifactId}-${project.version}-${timestamp}-${git.commit.id.abbrev}</finalName>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources/</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>version.txt</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.5.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.7</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.18.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>pl.project13.maven</groupId>
+                    <artifactId>git-commit-id-plugin</artifactId>
+                    <version>2.2.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                    <dateFormat>yyyy-MM-dd HH:mm:ss z</dateFormat>
+                    <abbrevLength>7</abbrevLength>
+                    <injectAllReactorProjects>true</injectAllReactorProjects>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <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>
+                <configuration>
+                    <!-- To skip tests by default -->
+                    <skipTests>${skipTests}</skipTests>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <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.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <failOnError>true</failOnError>
+                    <verbose>true</verbose>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <reportPlugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-project-info-reports-plugin</artifactId>
+                            <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>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
+            </plugin>
+
+        </plugins>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-provider-gitexe</artifactId>
+                <version>1.9.4</version>
+            </extension>
+            <extension>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-manager-plexus</artifactId>
+                <version>1.9.4</version>
+            </extension>
+            <extension>
+                <groupId>org.kathrynhuxtable.maven.wagon</groupId>
+                <artifactId>wagon-gitsite</artifactId>
+                <version>0.3.1</version>
+            </extension>
+        </extensions>
+
+    </build>
+
 </project>

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

@@ -0,0 +1,61 @@
+/*
+ *      Copyright (c) 2004-2015 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;
+
+import com.omertron.themoviedbapi.interfaces.AppendToResponseMethod;
+
+/**
+ * Simple string builder for the Append To Response methods
+ *
+ * @author Stuart.Boston
+ */
+public class AppendToResponseBuilder {
+
+    private final StringBuilder response;
+
+    /**
+     * Construct the builder with the first method
+     *
+     * @param method
+     */
+    public AppendToResponseBuilder(AppendToResponseMethod method) {
+        response = new StringBuilder(method.getPropertyString());
+    }
+
+    /**
+     * Generate the string
+     *
+     * @return
+     */
+    public String build() {
+        return response.toString();
+    }
+
+    /**
+     * Add a method to the list
+     *
+     * @param method
+     * @return
+     */
+    public AppendToResponseBuilder add(AppendToResponseMethod method) {
+        response.append(",").append(method.getPropertyString());
+        return this;
+    }
+}

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

@@ -0,0 +1,141 @@
+/*
+ *      Copyright (c) 2004-2015 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;
+
+import com.omertron.themoviedbapi.model.movie.MovieInfo;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Compare various objects to see if the are logically the same.
+ *
+ * Allows for some variance of the details
+ *
+ * @author Stuart.Boston
+ */
+public class Compare {
+
+    // Constants
+    private static final int YEAR_LENGTH = 4;
+
+    private Compare() {
+        throw new UnsupportedOperationException("Utility class");
+    }
+
+    /**
+     * Compare the MovieDB object with a title & year
+     *
+     * @param moviedb The moviedb object to compare too
+     * @param title The title of the movie to compare
+     * @param year The year of the movie to compare exact match
+     * @return True if there is a match, False otherwise.
+     */
+    public static boolean movies(final MovieInfo moviedb, final String title, final String year) {
+        return movies(moviedb, title, year, 0, true);
+    }
+
+    /**
+     * Compare the MovieDB object with a title & year
+     *
+     * @param moviedb The moviedb object to compare too
+     * @param title The title of the movie to compare
+     * @param year The year of the movie to compare
+     * @param maxDistance The Levenshtein Distance between the two titles. 0 =
+     * exact match
+     * @param caseSensitive true if the comparison is to be case sensitive
+     * @return True if there is a match, False otherwise.
+     */
+    public static boolean movies(final MovieInfo moviedb, final String title, final String year, int maxDistance, boolean caseSensitive) {
+        if ((moviedb == null) || (StringUtils.isBlank(title))) {
+            return false;
+        }
+
+        String primaryTitle, firstCompareTitle, secondCompareTitle;
+        if (caseSensitive) {
+            primaryTitle = title;
+            firstCompareTitle = moviedb.getOriginalTitle();
+            secondCompareTitle = moviedb.getTitle();
+        } else {
+            primaryTitle = title.toLowerCase();
+            firstCompareTitle = moviedb.getTitle().toLowerCase();
+            secondCompareTitle = moviedb.getOriginalTitle().toLowerCase();
+        }
+
+        if (isValidYear(year) && isValidYear(moviedb.getReleaseDate())) {
+            // Compare with year
+            String movieYear = moviedb.getReleaseDate().substring(0, YEAR_LENGTH);
+            return movieYear.equals(year) && compareTitles(primaryTitle, firstCompareTitle, secondCompareTitle, maxDistance);
+        }
+
+        // Compare without year
+        return compareTitles(primaryTitle, firstCompareTitle, secondCompareTitle, maxDistance);
+    }
+
+    /**
+     * Compare a title with two other titles.
+     *
+     * @param primaryTitle Primary title
+     * @param firstCompareTitle First title to compare with
+     * @param secondCompareTitle Second title to compare with
+     * @param maxDistance Maximum difference between the titles
+     * @return
+     */
+    private static boolean compareTitles(String primaryTitle, String firstCompareTitle, String secondCompareTitle, int maxDistance) {
+        // Compare with the first title
+        if (compareDistance(primaryTitle, firstCompareTitle, maxDistance)) {
+            return true;
+        }
+
+        // Compare with the other title
+        return compareDistance(primaryTitle, secondCompareTitle, maxDistance);
+    }
+
+    /**
+     * Compare the MovieDB object with a title & year, case sensitive
+     *
+     * @param moviedb
+     * @param title
+     * @param year
+     * @param maxDistance
+     * @return
+     */
+    public static boolean movies(final MovieInfo moviedb, final String title, final String year, int maxDistance) {
+        return Compare.movies(moviedb, title, year, maxDistance, true);
+    }
+
+    /**
+     * Compare the Levenshtein Distance between the two strings
+     *
+     * @param title1
+     * @param title2
+     * @param distance
+     */
+    private static boolean compareDistance(final String title1, final String title2, int distance) {
+        return StringUtils.getLevenshteinDistance(title1, title2) <= distance;
+    }
+
+    /**
+     * Check the year is not blank or UNKNOWN
+     *
+     * @param year
+     */
+    private static boolean isValidYear(final String year) {
+        return StringUtils.isNotBlank(year) && !"UNKNOWN".equals(year);
+    }
+}

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -19,69 +19,45 @@
  */
 package com.omertron.themoviedbapi;
 
-public class MovieDbException extends Exception {
+import java.net.URL;
+import org.yamj.api.common.exception.ApiException;
+import org.yamj.api.common.exception.ApiExceptionType;
 
-    private static final long serialVersionUID = 1L;
+public class MovieDbException extends ApiException {
 
-    public enum MovieDbExceptionType {
+    public MovieDbException(ApiExceptionType exceptionType, String response) {
-        /*
+        super(exceptionType, response);
-         * Unknown error occured
-         */
-        UNKNOWN_CAUSE,
-        /*
-         * URL is invalid
-         */
-        INVALID_URL,
-        /*
-         * Page not found
-         */
-        HTTP_404_ERROR,
-        /*
-         * The movie id was not found
-         */
-        MOVIE_ID_NOT_FOUND,
-        /*
-         * Mapping failed from target to internal onbjects
-         */
-        MAPPING_FAILED,
-        /*
-         * Error connecting to the service
-         */
-        CONNECTION_ERROR,
-        /*
-         * Image was invalid
-         */
-        INVALID_IMAGE,
-        /*
-         * Autorisation rejected
-         */
-        AUTHORISATION_FAILURE,
-        /*
-         * Service Unavailable, usually temporary
-         */
-        HTTP_503_ERROR;
     }
 
-    private final MovieDbExceptionType exceptionType;
+    public MovieDbException(ApiExceptionType exceptionType, String response, URL url) {
-    private final String response;
+        super(exceptionType, response, url);
-
-    public MovieDbException(final MovieDbExceptionType exceptionType, final String response) {
-        super();
-        this.exceptionType = exceptionType;
-        this.response = response;
     }
 
-    public MovieDbException(final MovieDbExceptionType exceptionType, final String response, final Throwable cause) {
+    public MovieDbException(ApiExceptionType exceptionType, String response, int responseCode, URL url) {
-        super(cause);
+        super(exceptionType, response, responseCode, url);
-        this.exceptionType = exceptionType;
-        this.response = response;
     }
 
-    public MovieDbExceptionType getExceptionType() {
+    public MovieDbException(ApiExceptionType exceptionType, String response, String url) {
-        return exceptionType;
+        super(exceptionType, response, url);
     }
 
-    public String getResponse() {
+    public MovieDbException(ApiExceptionType exceptionType, String response, int responseCode, String url) {
-        return response;
+        super(exceptionType, response, responseCode, url);
+    }
+
+    public MovieDbException(ApiExceptionType exceptionType, String response, URL url, Throwable cause) {
+        super(exceptionType, response, url, cause);
+    }
+
+    public MovieDbException(ApiExceptionType exceptionType, String response, int responseCode, URL url, Throwable cause) {
+        super(exceptionType, response, responseCode, url, cause);
+    }
+
+    public MovieDbException(ApiExceptionType exceptionType, String response, String url, Throwable cause) {
+        super(exceptionType, response, url, cause);
+    }
+
+    public MovieDbException(ApiExceptionType exceptionType, String response, int responseCode, String url, Throwable cause) {
+        super(exceptionType, response, responseCode, url, cause);
     }
 }

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

@@ -0,0 +1,64 @@
+/*
+ *      Copyright (c) 2004-2015 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.enumeration;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * ArtworkType enum List of the artwork types that are available
+ */
+public enum ArtworkType {
+
+    /**
+     * Poster artwork
+     */
+    POSTER,
+    /**
+     * Fanart/backdrop
+     */
+    BACKDROP,
+    /**
+     * Person image
+     */
+    PROFILE,
+    /**
+     * Still (Video image)
+     */
+    STILL;
+
+    /**
+     * Convert a string into an Enum type
+     *
+     * @param artworkType
+     * @return
+     * @throws IllegalArgumentException If type is not recognised
+     *
+     */
+    public static ArtworkType fromString(String artworkType) {
+        if (StringUtils.isNotBlank(artworkType)) {
+            try {
+                return ArtworkType.valueOf(artworkType.trim().toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                throw new IllegalArgumentException("ArtworkType " + artworkType + " does not exist.", ex);
+            }
+        }
+        throw new IllegalArgumentException("ArtworkType must not be null");
+    }
+}

src/main/java/com/omertron/themoviedbapi/enumeration/CreditType.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,14 +17,14 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.enumeration;
 
 /**
- * @author stuart.boston
+ *
+ * @author Stuart
  */
-public enum PersonType {
+public enum CreditType {
 
-    CAST, // A member of the cast
+    CAST,
-    CREW, // A member of the crew
+    CREW;
-    PERSON  // No specific type
 }

src/main/java/com/omertron/themoviedbapi/enumeration/ExternalSource.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,14 +17,22 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.enumeration;
 
 /**
- * ArtworkType enum List of the artwork types that are available
+ *
+ * @author Stuart
  */
-public enum ArtworkType {
+public enum ExternalSource {
+
+    FREEBASE_ID,
+    FREEBASE_MID,
+    IMDB_ID,
+    TVDB_ID,
+    TVRAGE_ID;
+
+    public String getPropertyString() {
+        return this.name().toLowerCase();
+    }
 
-    POSTER,     // Poster artwork
-    BACKDROP,   // Fanart/backdrop
-    PROFILE     // Person image
 }

src/main/java/com/omertron/themoviedbapi/enumeration/MediaType.java

@@ -0,0 +1,62 @@
+/*
+ *      Copyright (c) 2004-2015 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.enumeration;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Media type options
+ *
+ * @author Stuart
+ */
+public enum MediaType {
+
+    /**
+     * Movie media type
+     */
+    MOVIE,
+    /**
+     * TV Show media type
+     */
+    TV,
+    /**
+     * TV Episode media type
+     */
+    EPISODE;
+
+    /**
+     * Convert a string into an Enum type
+     *
+     * @param mediaType
+     * @return
+     * @throws IllegalArgumentException If type is not recognised
+     *
+     */
+    public static MediaType fromString(String mediaType) {
+        if (StringUtils.isNotBlank(mediaType)) {
+            try {
+                return MediaType.valueOf(mediaType.trim().toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                throw new IllegalArgumentException("MediaType " + mediaType + " does not exist.", ex);
+            }
+        }
+        throw new IllegalArgumentException("MediaType must not be null");
+    }
+}

src/main/java/com/omertron/themoviedbapi/enumeration/MovieMethod.java

@@ -0,0 +1,72 @@
+/*
+ *      Copyright (c) 2004-2015 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.enumeration;
+
+import com.omertron.themoviedbapi.interfaces.AppendToResponseMethod;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * List of all "Append To Response" movie methods
+ *
+ * @author Stuart
+ */
+public enum MovieMethod implements AppendToResponseMethod {
+
+    ALTERNATIVE_TITLES,
+    CHANGES,
+    CREDITS,
+    IMAGES,
+    KEYWORDS,
+    LISTS,
+    RELEASES,
+    REVIEWS,
+    SIMILAR,
+    TRANSLATIONS,
+    VIDEOS;
+
+    /**
+     * Get the string to use in the URL
+     *
+     * @return
+     */
+    @Override
+    public String getPropertyString() {
+        return this.name().toLowerCase();
+    }
+
+    /**
+     * Convert a string into an Enum type
+     *
+     * @param method
+     * @return
+     * @throws IllegalArgumentException If type is not recognised
+     *
+     */
+    public static MovieMethod fromString(String method) {
+        if (StringUtils.isNotBlank(method)) {
+            try {
+                return MovieMethod.valueOf(method.trim().toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                throw new IllegalArgumentException("Method " + method + " does not exist.", ex);
+            }
+        }
+        throw new IllegalArgumentException("Method must not be null");
+    }
+}

src/main/java/com/omertron/themoviedbapi/enumeration/PeopleMethod.java

@@ -0,0 +1,68 @@
+/*
+ *      Copyright (c) 2004-2015 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.enumeration;
+
+import com.omertron.themoviedbapi.interfaces.AppendToResponseMethod;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * List of People methods
+ *
+ * @author Stuart
+ */
+public enum PeopleMethod implements AppendToResponseMethod {
+
+    CHANGES,
+    COMBINED_CREDITS,
+    EXTERNAL_IDS,
+    IMAGES,
+    MOVIE_CREDITS,
+    TAGGED_IMAGES,
+    TV_CREDITS;
+
+    /**
+     * Get the string to use in the URL
+     *
+     * @return
+     */
+    @Override
+    public String getPropertyString() {
+        return this.name().toLowerCase();
+    }
+
+    /**
+     * Convert a string into an Enum type
+     *
+     * @param method
+     * @return
+     * @throws IllegalArgumentException If type is not recognised
+     *
+     */
+    public static PeopleMethod fromString(String method) {
+        if (StringUtils.isNotBlank(method)) {
+            try {
+                return PeopleMethod.valueOf(method.trim().toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                throw new IllegalArgumentException("Method " + method + " does not exist.", ex);
+            }
+        }
+        throw new IllegalArgumentException("Method must not be null");
+    }
+}

src/main/java/com/omertron/themoviedbapi/enumeration/SearchType.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2004-2015 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.enumeration;
+
+/**
+ *
+ * @author Stuart
+ */
+public enum SearchType {
+
+    PHRASE,
+    NGRAM;
+
+    public String getPropertyString() {
+        return this.name().toLowerCase();
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/enumeration/SortBy.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,31 +17,28 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.results;
+package com.omertron.themoviedbapi.enumeration;
 
-import java.util.HashMap;
+public enum SortBy {
-import java.util.Map;
 
-/**
+    CREATED_AT_ASC,
- * Map of the results from TheMovieDb
+    CREATED_AT_DESC,
- *
+    POPULARITY_ASC,
- * @author Stuart
+    POPULARITY_DESC,
- * @param <K>
+    RELEASE_DATE_ASC,
- * @param <V>
+    RELEASE_DATE_DESC,
- */
+    REVENUE_ASC,
-public final class TmdbResultsMap<K, V> extends TmdbResults {
+    REVENUE_DESC,
+    PRIMARY_RELEASE_DATE_ASC,
+    PRIMARY_RELEASE_DATE_DESC,
+    ORIGINAL_TITLE_ASC,
+    ORIGINAL_TITLE_DESC,
+    VOTE_AVERAGE_ASC,
+    VOTE_AVERAGE_DESC,
+    VOTE_COUNT_ASC,
+    VOTE_COUNT_DESC;
 
-    private Map<K, V> results;
+    public String getPropertyString() {
-
+        return this.name().toLowerCase().replace("_asc", ".asc").replaceAll("_desc", ".desc");
-    public TmdbResultsMap(Map<K, V> resultsMap) {
-        results = new HashMap<K, V>(resultsMap);
-    }
-
-    public Map<K, V> getResults() {
-        return results;
-    }
-
-    public void setResults(Map<K, V> results) {
-        this.results = results;
     }
 }

src/main/java/com/omertron/themoviedbapi/enumeration/TVEpisodeMethod.java

@@ -0,0 +1,65 @@
+/*
+ *      Copyright (c) 2004-2015 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.enumeration;
+
+import com.omertron.themoviedbapi.interfaces.AppendToResponseMethod;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * List of TV methods
+ *
+ * @author Stuart
+ */
+public enum TVEpisodeMethod implements AppendToResponseMethod {
+
+    CREDITS,
+    EXTERNAL_IDS,
+    IMAGES,
+    VIDEOS;
+
+    /**
+     * Get the string to use in the URL
+     *
+     * @return
+     */
+    @Override
+    public String getPropertyString() {
+        return this.name().toLowerCase();
+    }
+
+    /**
+     * Convert a string into an Enum type
+     *
+     * @param method
+     * @return
+     * @throws IllegalArgumentException If type is not recognised
+     *
+     */
+    public static TVEpisodeMethod fromString(String method) {
+        if (StringUtils.isNotBlank(method)) {
+            try {
+                return TVEpisodeMethod.valueOf(method.trim().toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                throw new IllegalArgumentException("Method " + method + " does not exist.", ex);
+            }
+        }
+        throw new IllegalArgumentException("Method must not be null");
+    }
+}

src/main/java/com/omertron/themoviedbapi/enumeration/TVMethod.java

@@ -0,0 +1,71 @@
+/*
+ *      Copyright (c) 2004-2015 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.enumeration;
+
+import com.omertron.themoviedbapi.interfaces.AppendToResponseMethod;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * List of TV methods
+ *
+ * @author Stuart
+ */
+public enum TVMethod implements AppendToResponseMethod {
+
+    ALTERNATIVE_TITLES,
+    CHANGES,
+    CONTENT_RATINGS,
+    CREDITS,
+    EXTERNAL_IDS,
+    IMAGES,
+    KEYWORDS,
+    SIMILAR,
+    TRANSLATIONS,
+    VIDEOS;
+
+    /**
+     * Get the string to use in the URL
+     *
+     * @return
+     */
+    @Override
+    public String getPropertyString() {
+        return this.name().toLowerCase();
+    }
+
+    /**
+     * Convert a string into an Enum type
+     *
+     * @param method
+     * @return
+     * @throws IllegalArgumentException If type is not recognised
+     *
+     */
+    public static TVMethod fromString(String method) {
+        if (StringUtils.isNotBlank(method)) {
+            try {
+                return TVMethod.valueOf(method.trim().toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                throw new IllegalArgumentException("Method " + method + " does not exist.", ex);
+            }
+        }
+        throw new IllegalArgumentException("Method must not be null");
+    }
+}

src/main/java/com/omertron/themoviedbapi/enumeration/TVSeasonMethod.java

@@ -0,0 +1,65 @@
+/*
+ *      Copyright (c) 2004-2015 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.enumeration;
+
+import com.omertron.themoviedbapi.interfaces.AppendToResponseMethod;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * List of TV methods
+ *
+ * @author Stuart
+ */
+public enum TVSeasonMethod implements AppendToResponseMethod {
+
+    CREDITS,
+    EXTERNAL_IDS,
+    IMAGES,
+    VIDEOS;
+
+    /**
+     * Get the string to use in the URL
+     *
+     * @return
+     */
+    @Override
+    public String getPropertyString() {
+        return this.name().toLowerCase();
+    }
+
+    /**
+     * Convert a string into an Enum type
+     *
+     * @param method
+     * @return
+     * @throws IllegalArgumentException If type is not recognised
+     *
+     */
+    public static TVSeasonMethod fromString(String method) {
+        if (StringUtils.isNotBlank(method)) {
+            try {
+                return TVSeasonMethod.valueOf(method.trim().toUpperCase());
+            } catch (IllegalArgumentException ex) {
+                throw new IllegalArgumentException("Method " + method + " does not exist.", ex);
+            }
+        }
+        throw new IllegalArgumentException("Method must not be null");
+    }
+}

src/main/java/com/omertron/themoviedbapi/interfaces/AppendToResponse.java

@@ -0,0 +1,32 @@
+/*
+ *      Copyright (c) 2004-2015 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.interfaces;
+
+/**
+ * Interface to indicate that the object has append to response methods
+ *
+ * @author Stuart
+ * @param <T> Method for Append To Response
+ */
+public interface AppendToResponse<T extends AppendToResponseMethod> {
+
+    boolean hasMethod(T method);
+
+}

src/main/java/com/omertron/themoviedbapi/interfaces/AppendToResponseMethod.java

@@ -0,0 +1,25 @@
+/*
+ *      Copyright (c) 2004-2015 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.interfaces;
+
+public interface AppendToResponseMethod {
+
+    String getPropertyString();
+}

src/main/java/com/omertron/themoviedbapi/interfaces/Identification.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,9 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.interfaces;
 
-public interface IWrapperId {
+public interface Identification {
 
     int getId();
 

src/main/java/com/omertron/themoviedbapi/interfaces/WrapperDates.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,9 +17,11 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.interfaces;
 
-public interface IWrapperDates {
+import com.omertron.themoviedbapi.results.ResultDates;
+
+public interface WrapperDates {
 
     ResultDates getDates();
 

src/main/java/com/omertron/themoviedbapi/interfaces/WrapperPages.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,9 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.interfaces;
 
-public interface IWrapperPages {
+public interface WrapperPages {
 
     int getPage();
 

src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java

@@ -0,0 +1,196 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.artwork.ArtworkMedia;
+import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
+import com.omertron.themoviedbapi.model.change.ChangeListItem;
+import com.omertron.themoviedbapi.model.collection.Collection;
+import com.omertron.themoviedbapi.model.company.Company;
+import com.omertron.themoviedbapi.model.keyword.Keyword;
+import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model.media.AlternativeTitle;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.model.movie.MovieInfo;
+import com.omertron.themoviedbapi.model.person.ContentRating;
+import com.omertron.themoviedbapi.model.person.PersonInfo;
+import com.omertron.themoviedbapi.model.person.PersonFind;
+import com.omertron.themoviedbapi.model.review.Review;
+import com.omertron.themoviedbapi.model.tv.TVBasic;
+import com.omertron.themoviedbapi.model.tv.TVInfo;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperChanges;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Abstract methods
+ *
+ * @author Stuart
+ */
+public class AbstractMethod {
+
+    // The API key to be used
+    protected final String apiKey;
+    // The HttpTools to use
+    protected final HttpTools httpTools;
+    // Jackson JSON configuration
+    protected static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final Map<Class, TypeReference> TYPE_REFS = new HashMap<>();
+
+    static {
+        TYPE_REFS.put(MovieBasic.class, new TypeReference<WrapperGenericList<MovieBasic>>() {
+        });
+        TYPE_REFS.put(TVBasic.class, new TypeReference<WrapperGenericList<TVBasic>>() {
+        });
+        TYPE_REFS.put(UserList.class, new TypeReference<WrapperGenericList<UserList>>() {
+        });
+        TYPE_REFS.put(Company.class, new TypeReference<WrapperGenericList<Company>>() {
+        });
+        TYPE_REFS.put(Collection.class, new TypeReference<WrapperGenericList<Collection>>() {
+        });
+        TYPE_REFS.put(Keyword.class, new TypeReference<WrapperGenericList<Keyword>>() {
+        });
+        TYPE_REFS.put(MovieInfo.class, new TypeReference<WrapperGenericList<MovieInfo>>() {
+        });
+        TYPE_REFS.put(PersonInfo.class, new TypeReference<WrapperGenericList<PersonInfo>>() {
+        });
+        TYPE_REFS.put(PersonFind.class, new TypeReference<WrapperGenericList<PersonFind>>() {
+        });
+        TYPE_REFS.put(Review.class, new TypeReference<WrapperGenericList<Review>>() {
+        });
+        TYPE_REFS.put(ChangeListItem.class, new TypeReference<WrapperGenericList<ChangeListItem>>() {
+        });
+        TYPE_REFS.put(ArtworkMedia.class, new TypeReference<WrapperGenericList<ArtworkMedia>>() {
+        });
+        TYPE_REFS.put(ContentRating.class, new TypeReference<WrapperGenericList<ContentRating>>() {
+        });
+        TYPE_REFS.put(TVInfo.class, new TypeReference<WrapperGenericList<TVInfo>>() {
+        });
+        TYPE_REFS.put(AlternativeTitle.class, new TypeReference<WrapperGenericList<AlternativeTitle>>() {
+        });
+
+    }
+
+    /**
+     * Default constructor for the methods
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public AbstractMethod(String apiKey, HttpTools httpTools) {
+        this.apiKey = apiKey;
+        this.httpTools = httpTools;
+    }
+
+    /**
+     * Helper function to get a pre-generated TypeReference for a class
+     *
+     * @param aClass
+     * @return
+     * @throws MovieDbException
+     */
+    protected static TypeReference getTypeReference(Class aClass) throws MovieDbException {
+        if (TYPE_REFS.containsKey(aClass)) {
+            return TYPE_REFS.get(aClass);
+        } else {
+            throw new MovieDbException(ApiExceptionType.UNKNOWN_CAUSE, "Class type reference for '" + aClass.getSimpleName() + "' not found!");
+        }
+    }
+
+    /**
+     * Process the wrapper list and return the results
+     *
+     * @param <T> Type of list to process
+     * @param typeRef
+     * @param url URL of the page (Error output only)
+     * @param errorMessageSuffix Error message to output (Error output only)
+     * @return
+     * @throws MovieDbException
+     */
+    protected <T> List<T> processWrapperList(TypeReference typeRef, URL url, String errorMessageSuffix) throws MovieDbException {
+        WrapperGenericList<T> val = processWrapper(typeRef, url, errorMessageSuffix);
+        return val.getResults();
+    }
+
+    /**
+     * Process the wrapper list and return the whole wrapper
+     *
+     * @param <T> Type of list to process
+     * @param typeRef
+     * @param url URL of the page (Error output only)
+     * @param errorMessageSuffix Error message to output (Error output only)
+     * @return
+     * @throws MovieDbException
+     */
+    protected <T> WrapperGenericList<T> processWrapper(TypeReference typeRef, URL url, String errorMessageSuffix) throws MovieDbException {
+        String webpage = httpTools.getRequest(url);
+        try {
+            // Due to type erasure, this doesn't work
+            // TypeReference<WrapperGenericList<T>> typeRef = new TypeReference<WrapperGenericList<T>>() {};
+            return MAPPER.readValue(webpage, typeRef);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get " + errorMessageSuffix, url, ex);
+        }
+    }
+
+    /**
+     *
+     * Look up the media's changes by ID
+     *
+     * @param mediaID
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws MovieDbException
+     */
+    protected ResultList<ChangeKeyItem> getMediaChanges(int mediaID, String startDate, String endDate) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, mediaID);
+        parameters.add(Param.START_DATE, startDate);
+        parameters.add(Param.END_DATE, endDate);
+
+        URL url = new ApiUrl(apiKey, MethodBase.EPISODE).subMethod(MethodSub.CHANGES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperChanges wrapper = MAPPER.readValue(webpage, WrapperChanges.class);
+            ResultList<ChangeKeyItem> results = new ResultList<>(wrapper.getChangedItems());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get changes", url, ex);
+        }
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java

@@ -0,0 +1,326 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.enumeration.MediaType;
+import com.omertron.themoviedbapi.enumeration.SortBy;
+import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model.account.Account;
+import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.model.tv.TVBasic;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.PostBody;
+import com.omertron.themoviedbapi.tools.PostTools;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Account Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbAccount extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbAccount(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the basic information for an account. You will need to have a valid session id.
+     *
+     * @param sessionId
+     * @return
+     * @throws MovieDbException
+     */
+    public Account getAccount(String sessionId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, Account.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get Account", url, ex);
+        }
+    }
+
+    /**
+     * Get all lists of a given user
+     *
+     * @param sessionId
+     * @param accountId
+     * @return The lists
+     * @throws MovieDbException
+     */
+    public ResultList<UserList> getUserLists(String sessionId, int accountId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.LISTS).buildUrl(parameters);
+        WrapperGenericList<UserList> wrapper = processWrapper(getTypeReference(UserList.class), url, "user list");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of favorite movies for an account.
+     *
+     * @param sessionId
+     * @param accountId
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieBasic> getFavoriteMovies(String sessionId, int accountId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.FAVORITE_MOVIES).buildUrl(parameters);
+        WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, "favorite movies");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of favorite TV series for an account.
+     *
+     * @param sessionId
+     * @param accountId
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<TVBasic> getFavoriteTv(String sessionId, int accountId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.FAVORITE_TV).buildUrl(parameters);
+        WrapperGenericList<TVBasic> wrapper = processWrapper(getTypeReference(TVBasic.class), url, "favorite TV shows");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Add or remove a movie to an accounts favorite list.
+     *
+     * @param sessionId
+     * @param accountId
+     * @param mediaType
+     * @param mediaId
+     * @param setFavorite
+     * @return
+     * @throws MovieDbException
+     */
+    public StatusCode modifyFavoriteStatus(String sessionId, int accountId, MediaType mediaType, int mediaId, boolean setFavorite) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+
+        String jsonBody = new PostTools()
+                .add(PostBody.MEDIA_TYPE, mediaType.toString().toLowerCase())
+                .add(PostBody.MEDIA_ID, mediaId)
+                .add(PostBody.FAVORITE, setFavorite)
+                .build();
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.FAVORITE).buildUrl(parameters);
+        String webpage = httpTools.postRequest(url, jsonBody);
+
+        try {
+            return MAPPER.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to set favorite status", url, ex);
+        }
+    }
+
+    /**
+     * Get the list of rated movies (and associated rating) for an account.
+     *
+     * @param sessionId
+     * @param accountId
+     * @param page
+     * @param sortBy
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieBasic> getRatedMovies(String sessionId, int accountId, Integer page, String sortBy, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.SORT_BY, sortBy);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.RATED_MOVIES).buildUrl(parameters);
+        WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, "rated movies");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of rated TV shows (and associated rating) for an account.
+     *
+     * @param sessionId
+     * @param accountId
+     * @param page
+     * @param sortBy
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<TVBasic> getRatedTV(String sessionId, int accountId, Integer page, String sortBy, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.SORT_BY, sortBy);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.RATED_TV).buildUrl(parameters);
+        WrapperGenericList<TVBasic> wrapper = processWrapper(getTypeReference(TVBasic.class), url, "rated TV shows");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of movies on an accounts watch list.
+     *
+     * @param sessionId
+     * @param accountId
+     * @param page
+     * @param sortBy
+     * @param language
+     * @return The watch list of the user
+     * @throws MovieDbException
+     */
+    public ResultList<MovieBasic> getWatchListMovie(String sessionId, int accountId, Integer page, String sortBy, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.SORT_BY, sortBy);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.WATCHLIST_MOVIES).buildUrl(parameters);
+        WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, "movie watch list");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of movies on an accounts watch list.
+     *
+     * @param sessionId
+     * @param accountId
+     * @param page
+     * @param sortBy
+     * @param language
+     * @return The watch list of the user
+     * @throws MovieDbException
+     */
+    public ResultList<TVBasic> getWatchListTV(String sessionId, int accountId, Integer page, String sortBy, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.SORT_BY, sortBy);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.WATCHLIST_TV).buildUrl(parameters);
+        WrapperGenericList<TVBasic> wrapper = processWrapper(getTypeReference(TVBasic.class), url, "TV watch list");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Add or remove a movie to an accounts watch list.
+     *
+     * @param sessionId
+     * @param accountId
+     * @param movieId
+     * @param mediaType
+     * @param addToWatchlist
+     * @return
+     * @throws MovieDbException
+     */
+    public StatusCode modifyWatchList(String sessionId, int accountId, MediaType mediaType, Integer movieId, boolean addToWatchlist) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, accountId);
+
+        String jsonBody = new PostTools()
+                .add(PostBody.MEDIA_TYPE, mediaType.toString().toLowerCase())
+                .add(PostBody.MEDIA_ID, movieId)
+                .add(PostBody.WATCHLIST, addToWatchlist)
+                .build();
+
+        URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).subMethod(MethodSub.WATCHLIST).buildUrl(parameters);
+        String webpage = httpTools.postRequest(url, jsonBody);
+
+        try {
+            return MAPPER.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to modify watch list", url, ex);
+        }
+    }
+
+    /**
+     * Get a list of rated movies for a specific guest session id.
+     *
+     * @param guestSessionId
+     * @param language
+     * @param page
+     * @param sortBy only CREATED_AT_ASC or CREATED_AT_DESC is supported
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieBasic> getGuestRatedMovies(String guestSessionId, String language, Integer page, SortBy sortBy) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, guestSessionId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+        if (sortBy != null) {
+            // Only created_at is supported
+            parameters.add(Param.SORT_BY, "created_at");
+
+            if (sortBy.getPropertyString().endsWith("asc")) {
+                parameters.add(Param.SORT_ORDER, "asc");
+            } else {
+                parameters.add(Param.SORT_ORDER, "desc");
+            }
+        }
+
+        URL url = new ApiUrl(apiKey, MethodBase.GUEST_SESSION).subMethod(MethodSub.RATED_MOVIES_GUEST).buildUrl(parameters);
+        WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, "Guest Session Movies");
+        return wrapper.getResultsList();
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbAuthentication.java

@@ -0,0 +1,160 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.authentication.TokenAuthorisation;
+import com.omertron.themoviedbapi.model.authentication.TokenSession;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Authentication Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbAuthentication extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbAuthentication(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * This method is used to generate a valid request token for user based authentication.
+     *
+     * A request token is required in order to request a session id.
+     *
+     * You can generate any number of request tokens but they will expire after 60 minutes.
+     *
+     * As soon as a valid session id has been created the token will be destroyed.
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public TokenAuthorisation getAuthorisationToken() throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        URL url = new ApiUrl(apiKey, MethodBase.AUTH).subMethod(MethodSub.TOKEN_NEW).buildUrl(parameters);
+
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, TokenAuthorisation.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.AUTH_FAILURE, "Failed to get Authorisation Token", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to generate a session id for user based authentication.
+     *
+     * A session id is required in order to use any of the write methods.
+     *
+     * @param token
+     * @return
+     * @throws MovieDbException
+     */
+    public TokenSession getSessionToken(TokenAuthorisation token) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+
+        if (!token.getSuccess()) {
+            throw new MovieDbException(ApiExceptionType.AUTH_FAILURE, "Authorisation token was not successful!");
+        }
+
+        parameters.add(Param.TOKEN, token.getRequestToken());
+        URL url = new ApiUrl(apiKey, MethodBase.AUTH).subMethod(MethodSub.SESSION_NEW).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, TokenSession.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get Session Token", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to generate a session id for user based authentication. User must provide their username and password
+     *
+     * A session id is required in order to use any of the write methods.
+     *
+     * @param token Session token
+     * @param username User's username
+     * @param password User's password
+     * @return
+     * @throws MovieDbException
+     */
+    public TokenAuthorisation getSessionTokenLogin(TokenAuthorisation token, String username, String password) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+
+        if (!token.getSuccess()) {
+            throw new MovieDbException(ApiExceptionType.AUTH_FAILURE, "Authorisation token was not successful!");
+        }
+
+        parameters.add(Param.TOKEN, token.getRequestToken());
+        parameters.add(Param.USERNAME, username);
+        parameters.add(Param.PASSWORD, password);
+
+        URL url = new ApiUrl(apiKey, MethodBase.AUTH).subMethod(MethodSub.TOKEN_VALIDATE).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, TokenAuthorisation.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get Session Token", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to generate a guest session id.
+     *
+     * A guest session can be used to rate movies without having a registered TMDb user account.
+     *
+     * You should only generate a single guest session per user (or device) as you will be able to attach the ratings to a TMDb user
+     * account in the future.
+     *
+     * There are also IP limits in place so you should always make sure it's the end user doing the guest session actions.
+     *
+     * If a guest session is not used for the first time within 24 hours, it will be automatically discarded.
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public TokenSession getGuestSessionToken() throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.AUTH).subMethod(MethodSub.GUEST_SESSION).buildUrl();
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, TokenSession.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get Guest Session Token", url, ex);
+        }
+    }}

src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java

@@ -0,0 +1,93 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.results.ResultsMap;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import java.util.List;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.omertron.themoviedbapi.model.Certification;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Certification Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbCertifications extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbCertifications(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get a list of movies certification.
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultsMap<String, List<Certification>> getMoviesCertification() throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.CERTIFICATION).subMethod(MethodSub.MOVIE_LIST).buildUrl();
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            JsonNode node = MAPPER.readTree(webpage);
+            Map<String, List<Certification>> results = MAPPER.readValue(node.elements().next().traverse(), new TypeReference<Map<String, List<Certification>>>() {
+            });
+            return new ResultsMap<>(results);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get movie certifications", url, ex);
+        }
+    }
+
+    /**
+     * Get a list of tv certification.
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultsMap<String, List<Certification>> getTvCertification() throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.CERTIFICATION).subMethod(MethodSub.TV_LIST).buildUrl();
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            JsonNode node = MAPPER.readTree(webpage);
+            Map<String, List<Certification>> results = MAPPER.readValue(node.elements().next().traverse(), new TypeReference<Map<String, List<Certification>>>() {
+            });
+            return new ResultsMap<>(results);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get TV certifications", url, ex);
+        }
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java

@@ -0,0 +1,74 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.change.ChangeListItem;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import java.net.URL;
+
+/**
+ * Class to hold the Change Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbChanges extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbChanges(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get a list of Media IDs that have been edited.
+     *
+     * You can then use the movie/TV/person changes API to get the actual data that has been changed.
+     *
+     * @param method The method base to get
+     * @param page
+     * @param startDate the start date of the changes, optional
+     * @param endDate the end date of the changes, optional
+     * @return List of changed movie
+     * @throws MovieDbException
+     */
+    public ResultList<ChangeListItem> getChangeList(MethodBase method, Integer page, String startDate, String endDate) throws MovieDbException {
+        TmdbParameters params = new TmdbParameters();
+        params.add(Param.PAGE, page);
+        params.add(Param.START_DATE, startDate);
+        params.add(Param.END_DATE, endDate);
+
+        URL url = new ApiUrl(apiKey, method).subMethod(MethodSub.CHANGES).buildUrl(params);
+        WrapperGenericList<ChangeListItem> wrapper = processWrapper(getTypeReference(ChangeListItem.class), url, "changes");
+        return wrapper.getResultsList();
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java

@@ -0,0 +1,107 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.artwork.Artwork;
+import com.omertron.themoviedbapi.enumeration.ArtworkType;
+import com.omertron.themoviedbapi.model.collection.CollectionInfo;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Collections Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbCollections extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbCollections(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * This method is used to retrieve all of the basic information about a
+     * movie collection.
+     *
+     * You can get the ID needed for this method by making a getMovieInfo
+     * request for the belongs_to_collection.
+     *
+     * @param collectionId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public CollectionInfo getCollectionInfo(int collectionId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, collectionId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.COLLECTION).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, CollectionInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get collection information", url, ex);
+        }
+    }
+
+    /**
+     * Get all of the images for a particular collection by collection id.
+     *
+     * @param collectionId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Artwork> getCollectionImages(int collectionId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, collectionId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.COLLECTION).subMethod(MethodSub.IMAGES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll(ArtworkType.POSTER, ArtworkType.BACKDROP));
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get collection images", url, ex);
+        }
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java

@@ -0,0 +1,98 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.company.Company;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Company Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbCompanies extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbCompanies(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * This method is used to retrieve the basic information about a production company on TMDb.
+     *
+     * @param companyId
+     * @return
+     * @throws MovieDbException
+     */
+    public Company getCompanyInfo(int companyId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, companyId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.COMPANY).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, Company.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get company information", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to retrieve the movies associated with a company.
+     *
+     * These movies are returned in order of most recently released to oldest. The default response will return 20 movies per page.
+     *
+     * @param companyId
+     * @param language
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieBasic> getCompanyMovies(int companyId, String language, Integer page) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, companyId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.COMPANY).subMethod(MethodSub.MOVIES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+        WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, webpage);
+        return wrapper.getResultsList();
+    }
+
+}

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

@@ -0,0 +1,135 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.omertron.themoviedbapi.MovieDbException;
+import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
+import com.omertron.themoviedbapi.model.config.Configuration;
+import com.omertron.themoviedbapi.model.config.JobDepartment;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.results.ResultsMap;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.results.WrapperConfig;
+import com.omertron.themoviedbapi.results.WrapperJobList;
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Configuration Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbConfiguration extends AbstractMethod {
+
+    /**
+     * Cache the configuration in memory<br/>
+     * It rarely changes, so this should be safe.
+     */
+    private static Configuration config = null;
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbConfiguration(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the configuration<br/>
+     * If the configuration has been previously retrieved, use that instead
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public Configuration getConfig() throws MovieDbException {
+        if (config == null) {
+            URL configUrl = new ApiUrl(apiKey, MethodBase.CONFIGURATION).buildUrl();
+            String webpage = httpTools.getRequest(configUrl);
+
+            try {
+                WrapperConfig wc = MAPPER.readValue(webpage, WrapperConfig.class);
+                config = wc.getTmdbConfiguration();
+            } catch (IOException ex) {
+                throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to read configuration", configUrl, ex);
+            }
+        }
+        return config;
+    }
+
+    /**
+     * Get a list of valid jobs
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<JobDepartment> getJobs() throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.JOB).subMethod(MethodSub.LIST).buildUrl();
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperJobList wrapper = MAPPER.readValue(webpage, WrapperJobList.class);
+            ResultList<JobDepartment> results = new ResultList<>(wrapper.getJobs());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get job list", url, ex);
+        }
+    }
+
+    /**
+     * Get the list of supported timezones for the API methods that support them
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultsMap<String, List<String>> getTimezones() throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.TIMEZONES).subMethod(MethodSub.LIST).buildUrl();
+        String webpage = httpTools.getRequest(url);
+
+        List<Map<String, List<String>>> tzList;
+        try {
+            tzList = MAPPER.readValue(webpage, new TypeReference<List<Map<String, List<String>>>>() {
+            });
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get timezone list", url, ex);
+        }
+
+        ResultsMap<String, List<String>> timezones = new ResultsMap<>();
+
+        for (Map<String, List<String>> tzMap : tzList) {
+            for (Map.Entry<String, List<String>> x : tzMap.entrySet()) {
+                timezones.put(x.getKey(), x.getValue());
+            }
+        }
+
+        return timezones;
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java

@@ -0,0 +1,84 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.person.CreditInfo;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Credit Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbCredits extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbCredits(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the detailed information about a particular credit record.
+     * <p>
+     * This is currently only supported with the new credit model found in TV.
+     * <br/>
+     * These IDs can be found from any TV credit response as well as the
+     * TV_credits and combined_credits methods for people. <br/>
+     * The episodes object returns a list of episodes and are generally going to
+     * be guest stars. <br/>
+     * The season array will return a list of season numbers. <br/>
+     * Season credits are credits that were marked with the "add to every
+     * season" option in the editing interface and are assumed to be "season
+     * regulars".
+     *
+     * @param creditId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public CreditInfo getCreditInfo(String creditId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, creditId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.CREDIT).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, CreditInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get credit info", url, ex);
+        }
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java

@@ -0,0 +1,78 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.discover.Discover;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.model.tv.TVBasic;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import java.net.URL;
+
+/**
+ * Class to hold the Discover Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbDiscover extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbDiscover(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Discover movies by different types of data like average rating, number of votes, genres and certifications.
+     *
+     * @param discover A discover object containing the search criteria required
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieBasic> getDiscoverMovies(Discover discover) throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.DISCOVER).subMethod(MethodSub.MOVIE).buildUrl(discover.getParams());
+        String webpage = httpTools.getRequest(url);
+        WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, webpage);
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Discover movies by different types of data like average rating, number of votes, genres and certifications.
+     *
+     * @param discover A discover object containing the search criteria required
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<TVBasic> getDiscoverTV(Discover discover) throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.DISCOVER).subMethod(MethodSub.TV).buildUrl(discover.getParams());
+        String webpage = httpTools.getRequest(url);
+        WrapperGenericList<TVBasic> wrapper = processWrapper(getTypeReference(TVBasic.class), url, webpage);
+        return wrapper.getResultsList();
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java

@@ -0,0 +1,289 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
+import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model.artwork.Artwork;
+import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
+import com.omertron.themoviedbapi.model.media.MediaCreditList;
+import com.omertron.themoviedbapi.model.media.MediaState;
+import com.omertron.themoviedbapi.model.media.Video;
+import com.omertron.themoviedbapi.model.person.ExternalID;
+import com.omertron.themoviedbapi.model.tv.TVEpisodeInfo;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.PostBody;
+import com.omertron.themoviedbapi.tools.PostTools;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperVideos;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the TV Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbEpisodes extends AbstractMethod {
+
+    private static final int RATING_MAX = 10;
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbEpisodes(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the primary information about a TV episode by combination of a season
+     * and episode number.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param episodeNumber
+     * @param language
+     * @param appendToResponse
+     * @return
+     * @throws MovieDbException
+     */
+    public TVEpisodeInfo getEpisodeInfo(int tvID, int seasonNumber, int episodeNumber, String language, String... appendToResponse) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.EPISODE_NUMBER, episodeNumber);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
+
+        URL url = new ApiUrl(apiKey, MethodBase.EPISODE).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, TVEpisodeInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get TV Episode Info", url, ex);
+        }
+    }
+
+    /**
+     * Look up a TV episode's changes by episode ID
+     *
+     * @param episodeID
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<ChangeKeyItem> getEpisodeChanges(int episodeID, String startDate, String endDate) throws MovieDbException {
+        return getMediaChanges(episodeID, startDate, endDate);
+    }
+
+    /**
+     * This method lets users get the status of whether or not the TV episode
+     * has been rated.
+     *
+     * A valid session id is required.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param episodeNumber
+     * @param sessionID
+     * @return
+     * @throws MovieDbException
+     */
+    public MediaState getEpisodeAccountState(int tvID, int seasonNumber, int episodeNumber, String sessionID) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SESSION_ID, sessionID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.EPISODE_NUMBER, episodeNumber);
+
+        URL url = new ApiUrl(apiKey, MethodBase.EPISODE).subMethod(MethodSub.ACCOUNT_STATES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, MediaState.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get account state", url, ex);
+        }
+    }
+
+    /**
+     * Get the TV episode credits by combination of season and episode number.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param episodeNumber
+     * @return
+     * @throws MovieDbException
+     */
+    public MediaCreditList getEpisodeCredits(int tvID, int seasonNumber, int episodeNumber) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.EPISODE_NUMBER, episodeNumber);
+
+        URL url = new ApiUrl(apiKey, MethodBase.EPISODE).subMethod(MethodSub.CREDITS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+        try {
+            return MAPPER.readValue(webpage, MediaCreditList.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get credits", url, ex);
+        }
+    }
+
+    /**
+     * Get the external ids for a TV episode by comabination of a season and
+     * episode number.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param episodeNumber
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ExternalID getEpisodeExternalID(int tvID, int seasonNumber, int episodeNumber, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.EPISODE_NUMBER, episodeNumber);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.EPISODE).subMethod(MethodSub.EXTERNAL_IDS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, ExternalID.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get external IDs", url, ex);
+        }
+    }
+
+    /**
+     * Get the images (episode stills) for a TV episode by combination of a
+     * season and episode number.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param episodeNumber
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Artwork> getEpisodeImages(int tvID, int seasonNumber, int episodeNumber) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.EPISODE_NUMBER, episodeNumber);
+
+        URL url = new ApiUrl(apiKey, MethodBase.EPISODE).subMethod(MethodSub.IMAGES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get images", url, ex);
+        }
+    }
+
+    /**
+     * This method lets users rate a TV episode. A valid session id or guest
+     * session id is required.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param episodeNumber
+     * @param rating
+     * @param sessionID
+     * @param guestSessionID
+     * @return
+     * @throws MovieDbException
+     */
+    public StatusCode postEpisodeRating(int tvID, int seasonNumber, int episodeNumber, int rating, String sessionID, String guestSessionID) throws MovieDbException {
+        if (rating < 0 || rating > RATING_MAX) {
+            throw new MovieDbException(ApiExceptionType.UNKNOWN_CAUSE, "Rating out of range");
+        }
+
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.EPISODE_NUMBER, episodeNumber);
+        parameters.add(Param.SESSION_ID, sessionID);
+        parameters.add(Param.GUEST_SESSION_ID, guestSessionID);
+
+        URL url = new ApiUrl(apiKey, MethodBase.EPISODE).subMethod(MethodSub.RATING).buildUrl(parameters);
+        String jsonBody = new PostTools()
+                .add(PostBody.VALUE, rating)
+                .build();
+        String webpage = httpTools.postRequest(url, jsonBody);
+
+        try {
+            return MAPPER.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to post rating", url, ex);
+        }
+    }
+
+    /**
+     * Get the videos that have been added to a TV episode (teasers, clips,
+     * etc...)
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param episodeNumber
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Video> getEpisodeVideos(int tvID, int seasonNumber, int episodeNumber, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.EPISODE_NUMBER, episodeNumber);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.EPISODE).subMethod(MethodSub.VIDEOS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperVideos wrapper = MAPPER.readValue(webpage, WrapperVideos.class);
+            ResultList<Video> results = new ResultList<>(wrapper.getVideos());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get videos", url, ex);
+        }
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbFind.java

@@ -0,0 +1,87 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.enumeration.ExternalSource;
+import com.omertron.themoviedbapi.model.FindResults;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Find Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbFind extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbFind(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * You con use this method to find movies, tv series or persons using external ids.
+     *
+     * Supported query ids are
+     * <ul>
+     * <li>Movies: imdb_id</li>
+     * <li>People: imdb_id, freebase_mid, freebase_id, tvrage_id</li>
+     * <li>TV Series: imdb_id, freebase_mid, freebase_id, tvdb_id, tvrage_id</li>
+     * <li>TV Seasons: freebase_mid, freebase_id, tvdb_id, tvrage_id</li>
+     * <li>TV Episodes: imdb_id, freebase_mid, freebase_id, tvdb_id, tvrage_idimdb_id, freebase_mid, freebase_id, tvrage_id,
+     * tvdb_id.
+     * </ul>
+     *
+     * For details see http://docs.themoviedb.apiary.io/#find
+     *
+     * @param id the external id
+     * @param externalSource one of {@link ExternalSource}.
+     * @param language the language
+     * @return
+     * @throws MovieDbException
+     */
+    public FindResults find(String id, ExternalSource externalSource, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, id);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.EXTERNAL_SOURCE, externalSource.getPropertyString());
+
+        URL url = new ApiUrl(apiKey, MethodBase.FIND).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, FindResults.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get find results", url, ex);
+        }
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.Genre;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenres;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Genre Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbGenres extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbGenres(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the list of movie genres.
+     *
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Genre> getGenreMovieList(String language) throws MovieDbException {
+        return getGenreList(language, MethodSub.MOVIE_LIST);
+    }
+
+    /**
+     * Get the list of TV genres.
+     *
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Genre> getGenreTVList(String language) throws MovieDbException {
+        return getGenreList(language, MethodSub.TV_LIST);
+    }
+
+    /**
+     * Get the list of genres for movies or TV
+     *
+     * @param language
+     * @param sub
+     * @return
+     * @throws MovieDbException
+     */
+    private ResultList<Genre> getGenreList(String language, MethodSub sub) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.GENRE).subMethod(sub).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperGenres wrapper = MAPPER.readValue(webpage, WrapperGenres.class);
+            ResultList<Genre> results = new ResultList<>(wrapper.getGenres());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get genre " + sub.toString(), url, ex);
+        }
+    }
+
+    /**
+     * Get the list of movies for a particular genre by id.
+     *
+     * By default, only movies with 10 or more votes are included.
+     *
+     * @param genreId
+     * @param language
+     * @param page
+     * @param includeAllMovies
+     * @param includeAdult
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieBasic> getGenreMovies(int genreId, String language, Integer page, Boolean includeAllMovies, Boolean includeAdult) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, genreId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.INCLUDE_ALL_MOVIES, includeAllMovies);
+        parameters.add(Param.INCLUDE_ADULT, includeAdult);
+
+        URL url = new ApiUrl(apiKey, MethodBase.GENRE).subMethod(MethodSub.MOVIES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, webpage);
+        return wrapper.getResultsList();
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java

@@ -0,0 +1,96 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.keyword.Keyword;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Keyword Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbKeywords extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbKeywords(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the basic information for a specific keyword id.
+     *
+     * @param keywordId
+     * @return
+     * @throws MovieDbException
+     */
+    public Keyword getKeyword(String keywordId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, keywordId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.KEYWORD).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, Keyword.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get keyword " + keywordId, url, ex);
+        }
+
+    }
+
+    /**
+     * Get the list of movies for a particular keyword by id.
+     *
+     * @param keywordId
+     * @param language
+     * @param page
+     * @return List of movies with the keyword
+     * @throws MovieDbException
+     */
+    public ResultList<MovieBasic> getKeywordMovies(String keywordId, String language, Integer page) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, keywordId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.KEYWORD).subMethod(MethodSub.MOVIES).buildUrl(parameters);
+        WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, "keyword movies");
+        return wrapper.getResultsList();
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java

@@ -0,0 +1,246 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.list.ListStatusCode;
+import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model.list.ListItem;
+import com.omertron.themoviedbapi.model.list.ListItemStatus;
+import com.omertron.themoviedbapi.model.movie.MovieInfo;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.PostBody;
+import com.omertron.themoviedbapi.tools.PostTools;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.apache.commons.lang3.StringUtils;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the List Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbLists extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbLists(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get a list by its ID
+     *
+     * @param listId
+     * @return The list and its items
+     * @throws MovieDbException
+     */
+    public ListItem<MovieInfo> getList(String listId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, listId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.LIST).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, new TypeReference<ListItem<MovieInfo>>() {
+            });
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get list", url, ex);
+        }
+    }
+
+    /**
+     * Check to see if an ID is already on a list.
+     *
+     * @param listId
+     * @param mediaId
+     * @return true if the movie is on the list
+     * @throws MovieDbException
+     */
+    public boolean checkItemStatus(String listId, int mediaId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, listId);
+        parameters.add(Param.MOVIE_ID, mediaId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.LIST).subMethod(MethodSub.ITEM_STATUS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, ListItemStatus.class).isItemPresent();
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get item status", url, ex);
+        }
+    }
+
+    /**
+     * This method lets users create a new list. A valid session id is required.
+     *
+     * @param sessionId
+     * @param name
+     * @param description
+     * @return The list id
+     * @throws MovieDbException
+     */
+    public String createList(String sessionId, String name, String description) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+
+        String jsonBody = new PostTools()
+                .add(PostBody.NAME, StringUtils.trimToEmpty(name))
+                .add(PostBody.DESCRIPTION, StringUtils.trimToEmpty(description))
+                .build();
+
+        URL url = new ApiUrl(apiKey, MethodBase.LIST).buildUrl(parameters);
+        String webpage = httpTools.postRequest(url, jsonBody);
+
+        try {
+            return MAPPER.readValue(webpage, ListStatusCode.class).getListId();
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to create list", url, ex);
+        }
+    }
+
+    /**
+     * This method lets users delete a list that they created. A valid session id is required.
+     *
+     * @param sessionId
+     * @param listId
+     * @return
+     * @throws MovieDbException
+     */
+    public StatusCode deleteList(String sessionId, String listId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, listId);
+        parameters.add(Param.SESSION_ID, sessionId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.LIST).buildUrl(parameters);
+        String webpage = httpTools.deleteRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to delete list", url, ex);
+        }
+    }
+
+    /**
+     * Modify a list
+     *
+     * This can be used to add or remove an item from the list
+     *
+     * @param sessionId
+     * @param listId
+     * @param movieId
+     * @param operation
+     * @return
+     * @throws MovieDbException
+     */
+    private StatusCode modifyMovieList(String sessionId, String listId, int movieId, MethodSub operation) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, listId);
+
+        String jsonBody = new PostTools()
+                .add(PostBody.MEDIA_ID, movieId)
+                .build();
+
+        URL url = new ApiUrl(apiKey, MethodBase.LIST).subMethod(operation).buildUrl(parameters);
+        String webpage = httpTools.postRequest(url, jsonBody);
+
+        try {
+            return MAPPER.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to remove item from list", url, ex);
+        }
+    }
+
+    /**
+     * This method lets users add new items to a list that they created.
+     *
+     * A valid session id is required.
+     *
+     * @param sessionId
+     * @param listId
+     * @param mediaId
+     * @return
+     * @throws MovieDbException
+     */
+    public StatusCode addItem(String sessionId, String listId, int mediaId) throws MovieDbException {
+        return modifyMovieList(sessionId, listId, mediaId, MethodSub.ADD_ITEM);
+    }
+
+    /**
+     * This method lets users delete items from a list that they created.
+     *
+     * A valid session id is required.
+     *
+     * @param sessionId
+     * @param listId
+     * @param mediaId
+     * @return
+     * @throws MovieDbException
+     */
+    public StatusCode removeItem(String sessionId, String listId, int mediaId) throws MovieDbException {
+        return modifyMovieList(sessionId, listId, mediaId, MethodSub.REMOVE_ITEM);
+    }
+
+    /**
+     * Clear all of the items within a list.
+     *
+     * This is a irreversible action and should be treated with caution.
+     *
+     * A valid session id is required. A call without confirm=true will return status code 29.
+     *
+     * @param sessionId
+     * @param listId
+     * @param confirm
+     * @return
+     * @throws MovieDbException
+     */
+    public StatusCode clear(String sessionId, String listId, boolean confirm) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.ID, listId);
+        parameters.add(Param.CONFIRM, confirm);
+
+        URL url = new ApiUrl(apiKey, MethodBase.LIST).subMethod(MethodSub.CLEAR).buildUrl(parameters);
+        String webpage = httpTools.postRequest(url, "");
+
+        try {
+            return MAPPER.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to clear list", url, ex);
+        }
+
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java

@@ -0,0 +1,575 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
+import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model.artwork.Artwork;
+import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
+import com.omertron.themoviedbapi.model.keyword.Keyword;
+import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model.media.AlternativeTitle;
+import com.omertron.themoviedbapi.model.media.MediaCreditList;
+import com.omertron.themoviedbapi.model.media.MediaState;
+import com.omertron.themoviedbapi.model.media.Translation;
+import com.omertron.themoviedbapi.model.media.Video;
+import com.omertron.themoviedbapi.model.movie.MovieInfo;
+import com.omertron.themoviedbapi.model.movie.ReleaseInfo;
+import com.omertron.themoviedbapi.model.review.Review;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.results.WrapperAlternativeTitles;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperMovieKeywords;
+import com.omertron.themoviedbapi.results.WrapperReleaseInfo;
+import com.omertron.themoviedbapi.results.WrapperTranslations;
+import com.omertron.themoviedbapi.results.WrapperVideos;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.PostBody;
+import com.omertron.themoviedbapi.tools.PostTools;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Movie Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbMovies extends AbstractMethod {
+
+    private static final int RATING_MAX = 10;
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbMovies(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * This method is used to retrieve all of the basic movie information.
+     *
+     * It will return the single highest rated poster and backdrop.
+     *
+     * ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies
+     * found.
+     *
+     * @param movieId
+     * @param language
+     * @param appendToResponse
+     * @return
+     * @throws MovieDbException
+     */
+    public MovieInfo getMovieInfo(int movieId, String language, String... appendToResponse) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+        try {
+            MovieInfo movie = MAPPER.readValue(webpage, MovieInfo.class);
+            if (movie == null || movie.getId() == 0) {
+                throw new MovieDbException(ApiExceptionType.ID_NOT_FOUND, "No movie found for ID: " + movieId, url);
+            }
+            return movie;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get info", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to retrieve all of the basic movie information.
+     *
+     * It will return the single highest rated poster and backdrop.
+     *
+     * ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies
+     * found.
+     *
+     * @param imdbId
+     * @param language
+     * @param appendToResponse
+     * @return
+     * @throws MovieDbException
+     */
+    public MovieInfo getMovieInfoImdb(String imdbId, String language, String... appendToResponse) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, imdbId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            MovieInfo movie = MAPPER.readValue(webpage, MovieInfo.class);
+            if (movie == null || movie.getId() == 0) {
+                throw new MovieDbException(ApiExceptionType.ID_NOT_FOUND, "No movie found for IMDB ID: " + imdbId, url);
+            }
+            return movie;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get info (IMDB)", url, ex);
+        }
+    }
+
+    /**
+     * This method lets a user get the status of whether or not the movie has
+     * been rated or added to their favourite or movie watch list.
+     *
+     * A valid session id is required.
+     *
+     * @param movieId
+     * @param sessionId
+     * @return
+     * @throws MovieDbException
+     */
+    public MediaState getMovieAccountState(int movieId, String sessionId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.SESSION_ID, sessionId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.ACCOUNT_STATES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, MediaState.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get account state", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to retrieve all of the alternative titles we have for
+     * a particular movie.
+     *
+     * @param movieId
+     * @param country
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<AlternativeTitle> getMovieAlternativeTitles(int movieId, String country) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.COUNTRY, country);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.ALT_TITLES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+        try {
+            WrapperAlternativeTitles wrapper = MAPPER.readValue(webpage, WrapperAlternativeTitles.class);
+            ResultList<AlternativeTitle> results = new ResultList<>(wrapper.getTitles());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get alternative titles", url, ex);
+        }
+    }
+
+    /**
+     * Get the cast and crew information for a specific movie id.
+     *
+     * @param movieId
+     * @return
+     * @throws MovieDbException
+     */
+    public MediaCreditList getMovieCredits(int movieId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.CREDITS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+        try {
+            return MAPPER.readValue(webpage, MediaCreditList.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get credits", url, ex);
+        }
+    }
+
+    /**
+     * This method should be used when you’re wanting to retrieve all of the
+     * images for a particular movie.
+     *
+     * @param movieId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Artwork> getMovieImages(int movieId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.IMAGES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get images", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to retrieve all of the keywords that have been added
+     * to a particular movie.
+     *
+     * Currently, only English keywords exist.
+     *
+     * @param movieId
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Keyword> getMovieKeywords(int movieId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.KEYWORDS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperMovieKeywords wrapper = MAPPER.readValue(webpage, WrapperMovieKeywords.class);
+            ResultList<Keyword> results = new ResultList<>(wrapper.getKeywords());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get keywords", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to retrieve all of the release and certification data
+     * we have for a specific movie.
+     *
+     * @param movieId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<ReleaseInfo> getMovieReleaseInfo(int movieId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.RELEASES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperReleaseInfo wrapper = MAPPER.readValue(webpage, WrapperReleaseInfo.class);
+            ResultList<ReleaseInfo> results = new ResultList<>(wrapper.getCountries());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get release information", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to retrieve all of the trailers for a particular
+     * movie.
+     *
+     * Supported sites are YouTube and QuickTime.
+     *
+     * @param movieId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Video> getMovieVideos(int movieId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.VIDEOS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperVideos wrapper = MAPPER.readValue(webpage, WrapperVideos.class);
+            ResultList<Video> results = new ResultList<>(wrapper.getVideos());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get videos", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to retrieve a list of the available translations for
+     * a specific movie.
+     *
+     * @param movieId
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Translation> getMovieTranslations(int movieId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.TRANSLATIONS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperTranslations wrapper = MAPPER.readValue(webpage, WrapperTranslations.class);
+            ResultList<Translation> results = new ResultList<>(wrapper.getTranslations());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get translations", url, ex);
+        }
+    }
+
+    /**
+     * The similar movies method will let you retrieve the similar movies for a
+     * particular movie.
+     *
+     * This data is created dynamically but with the help of users votes on
+     * TMDb.
+     *
+     * The data is much better with movies that have more keywords
+     *
+     * @param movieId
+     * @param language
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieInfo> getSimilarMovies(int movieId, Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.SIMILAR).buildUrl(parameters);
+        WrapperGenericList<MovieInfo> wrapper = processWrapper(getTypeReference(MovieInfo.class), url, "similar movies");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the reviews for a particular movie id.
+     *
+     * @param movieId
+     * @param page
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Review> getMovieReviews(int movieId, Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.REVIEWS).buildUrl(parameters);
+        WrapperGenericList<Review> wrapper = processWrapper(getTypeReference(Review.class), url, "review");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the lists that the movie belongs to
+     *
+     * @param movieId
+     * @param language
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<UserList> getMovieLists(int movieId, Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.LISTS).buildUrl(parameters);
+        WrapperGenericList<UserList> wrapper = processWrapper(getTypeReference(UserList.class), url, "movie lists");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the changes for a specific movie ID.
+     *
+     * Changes are grouped by key, and ordered by date in descending order.
+     *
+     * By default, only the last 24 hours of changes are returned.
+     *
+     * The maximum number of days that can be returned in a single request is
+     * 14.
+     *
+     * The language is present on fields that are translatable.
+     *
+     * @param movieId
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<ChangeKeyItem> getMovieChanges(int movieId, String startDate, String endDate) throws MovieDbException {
+        return getMediaChanges(movieId, startDate, endDate);
+    }
+
+    /**
+     * This method lets users rate a movie.
+     *
+     * A valid session id or guest session id is required.
+     *
+     * @param sessionId
+     * @param movieId
+     * @param rating
+     * @param guestSessionId
+     * @return
+     * @throws MovieDbException
+     */
+    public StatusCode postMovieRating(int movieId, int rating, String sessionId, String guestSessionId) throws MovieDbException {
+        if (rating < 0 || rating > RATING_MAX) {
+            throw new MovieDbException(ApiExceptionType.UNKNOWN_CAUSE, "Rating out of range");
+        }
+
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.SESSION_ID, sessionId);
+        parameters.add(Param.GUEST_SESSION_ID, guestSessionId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.RATING).buildUrl(parameters);
+
+        String jsonBody = new PostTools()
+                .add(PostBody.VALUE, rating)
+                .build();
+        String webpage = httpTools.postRequest(url, jsonBody);
+
+        try {
+            return MAPPER.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to post rating", url, ex);
+        }
+    }
+
+    /**
+     * This method is used to retrieve the newest movie that was added to TMDb.
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public MovieInfo getLatestMovie() throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.LATEST).buildUrl();
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, MovieInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get latest movie", url, ex);
+        }
+    }
+
+    /**
+     * Get the list of upcoming movies.
+     *
+     * This list refreshes every day.
+     *
+     * The maximum number of items this list will include is 100.
+     *
+     * @param language
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieInfo> getUpcoming(Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.UPCOMING).buildUrl(parameters);
+        WrapperGenericList<MovieInfo> wrapper = processWrapper(getTypeReference(MovieInfo.class), url, "upcoming movies");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * This method is used to retrieve the movies currently in theatres.
+     *
+     * This is a curated list that will normally contain 100 movies. The default
+     * response will return 20 movies.
+     *
+     * @param language
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieInfo> getNowPlayingMovies(Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.NOW_PLAYING).buildUrl(parameters);
+        WrapperGenericList<MovieInfo> wrapper = processWrapper(getTypeReference(MovieInfo.class), url, "now playing movies");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * This method is used to retrieve the daily movie popularity list.
+     *
+     * This list is updated daily. The default response will return 20 movies.
+     *
+     * @param language
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieInfo> getPopularMovieList(Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.POPULAR).buildUrl(parameters);
+        WrapperGenericList<MovieInfo> wrapper = processWrapper(getTypeReference(MovieInfo.class), url, "popular movie list");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * This method is used to retrieve the top rated movies that have over 10
+     * votes on TMDb.
+     *
+     * The default response will return 20 movies.
+     *
+     * @param language
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieInfo> getTopRatedMovies(Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.MOVIE).subMethod(MethodSub.TOP_RATED).buildUrl(parameters);
+        WrapperGenericList<MovieInfo> wrapper = processWrapper(getTypeReference(MovieInfo.class), url, "top rated movies");
+        return wrapper.getResultsList();
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbNetworks.java

@@ -0,0 +1,73 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.model.network.Network;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Network Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbNetworks extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbNetworks(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * This method is used to retrieve the basic information about a TV network.
+     * <p>
+     * You can use this ID to search for TV shows with the discover method.
+     *
+     * @param networkId
+     * @return
+     * @throws MovieDbException
+     */
+    public Network getNetworkInfo(int networkId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, networkId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.NETWORK).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, Network.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get network information", url, ex);
+        }
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java

@@ -0,0 +1,312 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.enumeration.ArtworkType;
+import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
+import com.omertron.themoviedbapi.model.artwork.Artwork;
+import com.omertron.themoviedbapi.model.artwork.ArtworkMedia;
+import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
+import com.omertron.themoviedbapi.model.credits.CreditBasic;
+import com.omertron.themoviedbapi.model.credits.CreditMovieBasic;
+import com.omertron.themoviedbapi.model.credits.CreditTVBasic;
+import com.omertron.themoviedbapi.model.person.ExternalID;
+import com.omertron.themoviedbapi.model.person.PersonCreditList;
+import com.omertron.themoviedbapi.model.person.PersonCreditsMixIn;
+import com.omertron.themoviedbapi.model.person.PersonFind;
+import com.omertron.themoviedbapi.model.person.PersonInfo;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.apache.commons.lang3.StringUtils;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the People Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbPeople extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbPeople(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the general person information for a specific id.
+     *
+     * @param personId
+     * @param appendToResponse
+     * @return
+     * @throws MovieDbException
+     */
+    public PersonInfo getPersonInfo(int personId, String... appendToResponse) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+        parameters.add(Param.APPEND, appendToResponse);
+
+        // Switch combined credits for tv & movie.
+        String atr = (String) parameters.get(Param.APPEND);
+        if (StringUtils.isNotBlank(atr) && atr.contains("combined_credits")) {
+            atr = atr.replace("combined_credits", "tv_credits,movie_credits");
+            parameters.add(Param.APPEND, atr);
+        }
+
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, PersonInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get person info", url, ex);
+        }
+    }
+
+    /**
+     * Get the movie credits for a specific person id.
+     *
+     * @param personId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public PersonCreditList<CreditMovieBasic> getPersonMovieCredits(int personId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).subMethod(MethodSub.MOVIE_CREDITS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            TypeReference tr = new TypeReference<PersonCreditList<CreditMovieBasic>>() {
+            };
+            return MAPPER.readValue(webpage, tr);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get person movie credits", url, ex);
+        }
+    }
+
+    /**
+     * Get the TV credits for a specific person id.
+     *
+     * To get the expanded details for each record, call the /credit method with
+     * the provided credit_id.
+     *
+     * This will provide details about which episode and/or season the credit is
+     * for.
+     *
+     * @param personId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public PersonCreditList<CreditTVBasic> getPersonTVCredits(int personId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).subMethod(MethodSub.TV_CREDITS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            TypeReference tr = new TypeReference<PersonCreditList<CreditTVBasic>>() {
+            };
+            return MAPPER.readValue(webpage, tr);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get person TV credits", url, ex);
+        }
+    }
+
+    /**
+     * Get the combined (movie and TV) credits for a specific person id.
+     *
+     * To get the expanded details for each TV record, call the /credit method
+     * with the provided credit_id.
+     *
+     * This will provide details about which episode and/or season the credit is
+     * for.
+     *
+     * @param personId
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public PersonCreditList<CreditBasic> getPersonCombinedCredits(int personId, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).subMethod(MethodSub.COMBINED_CREDITS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.addMixIn(PersonCreditList.class, PersonCreditsMixIn.class);
+            TypeReference tr = new TypeReference<PersonCreditList<CreditBasic>>() {
+            };
+            return mapper.readValue(webpage, tr);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get person combined credits", url, ex);
+        }
+    }
+
+    /**
+     * Get the external ids for a specific person id.
+     *
+     * @param personId
+     * @return
+     * @throws MovieDbException
+     */
+    public ExternalID getPersonExternalIds(int personId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).subMethod(MethodSub.EXTERNAL_IDS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, ExternalID.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get person external IDs", url, ex);
+        }
+    }
+
+    /**
+     * Get the images for a specific person id.
+     *
+     * @param personId
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Artwork> getPersonImages(int personId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).subMethod(MethodSub.IMAGES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll(ArtworkType.PROFILE));
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get person images", url, ex);
+        }
+    }
+
+    /**
+     * Get the images that have been tagged with a specific person id.
+     *
+     * We return all of the image results with a media object mapped for each
+     * image.
+     *
+     * @param personId
+     * @param page
+     * @param language
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<ArtworkMedia> getPersonTaggedImages(int personId, Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).subMethod(MethodSub.TAGGED_IMAGES).buildUrl(parameters);
+        WrapperGenericList<ArtworkMedia> wrapper = processWrapper(getTypeReference(ArtworkMedia.class), url, "tagged images");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the changes for a specific person id.
+     *
+     * Changes are grouped by key, and ordered by date in descending order.
+     *
+     * By default, only the last 24 hours of changes are returned.
+     *
+     * The maximum number of days that can be returned in a single request is
+     * 14.
+     *
+     * The language is present on fields that are translatable.
+     *
+     * @param personId
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<ChangeKeyItem> getPersonChanges(int personId, String startDate, String endDate) throws MovieDbException {
+        return getMediaChanges(personId, startDate, endDate);
+    }
+
+    /**
+     * Get the list of popular people on The Movie Database.
+     *
+     * This list refreshes every day.
+     *
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<PersonFind> getPersonPopular(Integer page) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).subMethod(MethodSub.POPULAR).buildUrl(parameters);
+        WrapperGenericList<PersonFind> wrapper = processWrapper(getTypeReference(PersonFind.class), url, "person popular");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the latest person id.
+     *
+     * @return
+     * @throws MovieDbException
+     */
+    public PersonInfo getPersonLatest() throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.PERSON).subMethod(MethodSub.LATEST).buildUrl();
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, PersonInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get latest person", url, ex);
+        }
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbReviews.java

@@ -0,0 +1,72 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
+import com.omertron.themoviedbapi.model.review.Review;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Review Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbReviews extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbReviews(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the full details of a review by ID.
+     *
+     * @param reviewId
+     * @return
+     * @throws MovieDbException
+     */
+    public Review getReview(String reviewId) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, reviewId);
+
+        URL url = new ApiUrl(apiKey, MethodBase.REVIEW).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, Review.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get review", url, ex);
+        }
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java

@@ -0,0 +1,265 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.enumeration.SearchType;
+import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
+import com.omertron.themoviedbapi.model.collection.Collection;
+import com.omertron.themoviedbapi.model.company.Company;
+import com.omertron.themoviedbapi.model.keyword.Keyword;
+import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model.media.MediaBasic;
+import com.omertron.themoviedbapi.model.movie.MovieInfo;
+import com.omertron.themoviedbapi.model.person.PersonFind;
+import com.omertron.themoviedbapi.model.tv.TVBasic;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperMultiSearch;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the Search Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbSearch extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbSearch(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Search Companies.
+     *
+     * You can use this method to search for production companies that are part of TMDb. The company IDs will map to those returned
+     * on movie calls.
+     *
+     * http://help.themoviedb.org/kb/api/search-companies
+     *
+     * @param query
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Company> searchCompanies(String query, Integer page) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEARCH).subMethod(MethodSub.COMPANY).buildUrl(parameters);
+        WrapperGenericList<Company> wrapper = processWrapper(getTypeReference(Company.class), url, "company");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Search for collections by name.
+     *
+     * @param query
+     * @param language
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Collection> searchCollection(String query, Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEARCH).subMethod(MethodSub.COLLECTION).buildUrl(parameters);
+        WrapperGenericList<Collection> wrapper = processWrapper(getTypeReference(Collection.class), url, "collection");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Search for keywords by name
+     *
+     * @param query
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Keyword> searchKeyword(String query, Integer page) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.PAGE, page);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEARCH).subMethod(MethodSub.KEYWORD).buildUrl(parameters);
+        WrapperGenericList<Keyword> wrapper = processWrapper(getTypeReference(Keyword.class), url, "keyword");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Search for lists by name and description.
+     *
+     * @param query
+     * @param includeAdult
+     * @param page
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<UserList> searchList(String query, Integer page, Boolean includeAdult) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.INCLUDE_ADULT, includeAdult);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEARCH).subMethod(MethodSub.LIST).buildUrl(parameters);
+        WrapperGenericList<UserList> wrapper = processWrapper(getTypeReference(UserList.class), url, "list");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Search Movies This is a good starting point to start finding movies on TMDb.
+     *
+     * @param query
+     * @param searchYear Limit the search to the provided year. Zero (0) will get all years
+     * @param language The language to include. Can be blank/null.
+     * @param includeAdult true or false to include adult titles in the search
+     * @param page The page of results to return. 0 to get the default (first page)
+     * @param primaryReleaseYear
+     * @param searchType
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MovieInfo> searchMovie(String query,
+            Integer page,
+            String language,
+            Boolean includeAdult,
+            Integer searchYear,
+            Integer primaryReleaseYear,
+            SearchType searchType) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.ADULT, includeAdult);
+        parameters.add(Param.YEAR, searchYear);
+        parameters.add(Param.PRIMARY_RELEASE_YEAR, primaryReleaseYear);
+        if (searchType != null) {
+            parameters.add(Param.SEARCH_TYPE, searchType.getPropertyString());
+        }
+        URL url = new ApiUrl(apiKey, MethodBase.SEARCH).subMethod(MethodSub.MOVIE).buildUrl(parameters);
+
+        WrapperGenericList<MovieInfo> wrapper = processWrapper(getTypeReference(MovieInfo.class), url, "movie");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Search the movie, tv show and person collections with a single query.
+     *
+     * Each item returned in the result array has a media_type field that maps to either movie, tv or person.
+     *
+     * Each mapped result is the same response you would get from each independent search
+     *
+     * @param query
+     * @param page
+     * @param language
+     * @param includeAdult
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<MediaBasic> searchMulti(String query, Integer page, String language, Boolean includeAdult) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.ADULT, includeAdult);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEARCH).subMethod(MethodSub.MULTI).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperMultiSearch wrapper = MAPPER.readValue(webpage, WrapperMultiSearch.class);
+            ResultList<MediaBasic> results = new ResultList<>();
+            results.getResults().addAll(wrapper.getResults());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get multi search", url, ex);
+        }
+    }
+
+    /**
+     * This is a good starting point to start finding people on TMDb.
+     *
+     * The idea is to be a quick and light method so you can iterate through people quickly.
+     *
+     * @param query
+     * @param includeAdult
+     * @param page
+     * @param searchType
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<PersonFind> searchPeople(String query, Integer page, Boolean includeAdult, SearchType searchType) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.ADULT, includeAdult);
+        parameters.add(Param.PAGE, page);
+        if (searchType != null) {
+            parameters.add(Param.SEARCH_TYPE, searchType.getPropertyString());
+        }
+        URL url = new ApiUrl(apiKey, MethodBase.SEARCH).subMethod(MethodSub.PERSON).buildUrl(parameters);
+        WrapperGenericList<PersonFind> wrapper = processWrapper(getTypeReference(PersonFind.class), url, "person");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Search for TV shows by title.
+     *
+     * @param query
+     * @param page
+     * @param language
+     * @param firstAirDateYear
+     * @param searchType
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<TVBasic> searchTV(String query, Integer page, String language, Integer firstAirDateYear, SearchType searchType) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.FIRST_AIR_DATE_YEAR, firstAirDateYear);
+        if (searchType != null) {
+            parameters.add(Param.SEARCH_TYPE, searchType.getPropertyString());
+        }
+        URL url = new ApiUrl(apiKey, MethodBase.SEARCH).subMethod(MethodSub.TV).buildUrl(parameters);
+        WrapperGenericList<TVBasic> wrapper = processWrapper(getTypeReference(TVBasic.class), url, "TV Show");
+        return wrapper.getResultsList();
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java

@@ -0,0 +1,230 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
+import com.omertron.themoviedbapi.model.artwork.Artwork;
+import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
+import com.omertron.themoviedbapi.model.media.MediaCreditList;
+import com.omertron.themoviedbapi.model.media.MediaState;
+import com.omertron.themoviedbapi.model.media.Video;
+import com.omertron.themoviedbapi.model.person.ExternalID;
+import com.omertron.themoviedbapi.model.tv.TVSeasonInfo;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperVideos;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the TV Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbSeasons extends AbstractMethod {
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbSeasons(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the primary information about a TV season by its season number.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param language
+     * @param appendToResponse
+     * @return
+     * @throws MovieDbException
+     */
+    public TVSeasonInfo getSeasonInfo(int tvID, int seasonNumber, String language, String... appendToResponse) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEASON).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, TVSeasonInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get TV Season Info", url, ex);
+        }
+    }
+
+    /**
+     * Look up a TV season's changes by season ID.
+     *
+     * @param tvID
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<ChangeKeyItem> getSeasonChanges(int tvID, String startDate, String endDate) throws MovieDbException {
+        return getMediaChanges(tvID, startDate, endDate);
+    }
+
+    /**
+     * This method lets users get the status of whether or not the TV episodes of a season have been rated.
+     *
+     * A valid session id is required.
+     *
+     * @param tvID
+     * @param sessionID
+     * @return
+     * @throws MovieDbException
+     */
+    public MediaState getSeasonAccountState(int tvID, String sessionID) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SESSION_ID, sessionID);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEASON).subMethod(MethodSub.ACCOUNT_STATES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, MediaState.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get account state", url, ex);
+        }
+    }
+
+    /**
+     * Get the cast & crew credits for a TV season by season number.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @return
+     * @throws MovieDbException
+     */
+    public MediaCreditList getSeasonCredits(int tvID, int seasonNumber) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEASON).subMethod(MethodSub.CREDITS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+        try {
+            return MAPPER.readValue(webpage, MediaCreditList.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get credits", url, ex);
+        }
+    }
+
+    /**
+     * Get the external ids that we have stored for a TV season by season number.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ExternalID getSeasonExternalID(int tvID, int seasonNumber, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEASON).subMethod(MethodSub.EXTERNAL_IDS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, ExternalID.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get external IDs", url, ex);
+        }
+    }
+
+    /**
+     * Get the images that we have stored for a TV season by season number.
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param language
+     * @param includeImageLanguage
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Artwork> getSeasonImages(int tvID, int seasonNumber, String language, String... includeImageLanguage) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, includeImageLanguage);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEASON).subMethod(MethodSub.IMAGES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get images", url, ex);
+        }
+    }
+
+    /**
+     * Get the videos that have been added to a TV season (trailers, teasers, etc...)
+     *
+     * @param tvID
+     * @param seasonNumber
+     * @param language
+     * @return
+     * @throws MovieDbException
+     */
+    public ResultList<Video> getSeasonVideos(int tvID, int seasonNumber, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SEASON_NUMBER, seasonNumber);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.SEASON).subMethod(MethodSub.VIDEOS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperVideos wrapper = MAPPER.readValue(webpage, WrapperVideos.class);
+            ResultList<Video> results = new ResultList<>(wrapper.getVideos());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get videos", url, ex);
+        }
+    }
+}

src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java

@@ -0,0 +1,465 @@
+/*
+ *      Copyright (c) 2004-2015 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.methods;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
+import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model.artwork.Artwork;
+import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
+import com.omertron.themoviedbapi.model.keyword.Keyword;
+import com.omertron.themoviedbapi.model.media.AlternativeTitle;
+import com.omertron.themoviedbapi.model.media.MediaCreditList;
+import com.omertron.themoviedbapi.model.media.MediaState;
+import com.omertron.themoviedbapi.model.media.Translation;
+import com.omertron.themoviedbapi.model.media.Video;
+import com.omertron.themoviedbapi.model.person.ContentRating;
+import com.omertron.themoviedbapi.model.person.ExternalID;
+import com.omertron.themoviedbapi.model.tv.TVBasic;
+import com.omertron.themoviedbapi.model.tv.TVInfo;
+import com.omertron.themoviedbapi.results.ResultList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperTranslations;
+import com.omertron.themoviedbapi.results.WrapperVideos;
+import com.omertron.themoviedbapi.tools.ApiUrl;
+import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.MethodBase;
+import com.omertron.themoviedbapi.tools.MethodSub;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.PostBody;
+import com.omertron.themoviedbapi.tools.PostTools;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+import java.io.IOException;
+import java.net.URL;
+import org.yamj.api.common.exception.ApiExceptionType;
+
+/**
+ * Class to hold the TV Methods
+ *
+ * @author stuart.boston
+ */
+public class TmdbTV extends AbstractMethod {
+
+    private static final int RATING_MAX = 10;
+
+    /**
+     * Constructor
+     *
+     * @param apiKey
+     * @param httpTools
+     */
+    public TmdbTV(String apiKey, HttpTools httpTools) {
+        super(apiKey, httpTools);
+    }
+
+    /**
+     * Get the primary information about a TV series by id.
+     *
+     * @param tvID
+     * @param language
+     * @param appendToResponse
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public TVInfo getTVInfo(int tvID, String language, String... appendToResponse) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, TVInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get TV Info", url, ex);
+        }
+    }
+
+    /**
+     * This method lets users get the status of whether or not the TV show has
+     * been rated or added to their favourite or watch lists.
+     *
+     * A valid session id is required.
+     *
+     * @param tvID
+     * @param sessionID
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public MediaState getTVAccountState(int tvID, String sessionID) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SESSION_ID, sessionID);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.ACCOUNT_STATES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, MediaState.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get account state", url, ex);
+        }
+    }
+
+    /**
+     * Get the alternative titles for a specific show ID.
+     *
+     * @param tvID
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<AlternativeTitle> getTVAlternativeTitles(int tvID) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.ALT_TITLES).buildUrl(parameters);
+        WrapperGenericList<AlternativeTitle> wrapper = processWrapper(getTypeReference(AlternativeTitle.class), url, "alternative titles");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the changes for a specific TV show id.
+     *
+     * @param tvID
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<ChangeKeyItem> getTVChanges(int tvID, String startDate, String endDate) throws MovieDbException {
+        return getMediaChanges(tvID, startDate, endDate);
+    }
+
+    /**
+     * Get the content ratings for a specific TV show id.
+     *
+     * @param tvID
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<ContentRating> getTVContentRatings(int tvID) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.CONTENT_RATINGS).buildUrl(parameters);
+        WrapperGenericList<ContentRating> wrapper = processWrapper(getTypeReference(ContentRating.class), url, "content rating");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the cast & crew information about a TV series.
+     *
+     * @param tvID
+     * @param language
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public MediaCreditList getTVCredits(int tvID, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.CREDITS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+        try {
+            return MAPPER.readValue(webpage, MediaCreditList.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get credits", url, ex);
+        }
+    }
+
+    /**
+     * Get the external ids that we have stored for a TV series.
+     *
+     * @param tvID
+     * @param language
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ExternalID getTVExternalIDs(int tvID, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.EXTERNAL_IDS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, ExternalID.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get external IDs", url, ex);
+        }
+    }
+
+    /**
+     * Get the images (posters and backdrops) for a TV series.
+     *
+     * @param tvID
+     * @param language
+     * @param includeImageLanguage
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<Artwork> getTVImages(int tvID, String language, String... includeImageLanguage) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.INCLUDE_IMAGE_LANGUAGE, includeImageLanguage);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.IMAGES).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperImages wrapper = MAPPER.readValue(webpage, WrapperImages.class);
+            ResultList<Artwork> results = new ResultList<>(wrapper.getAll());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get images", url, ex);
+        }
+    }
+
+    /**
+     * Get the plot keywords for a specific TV show id.
+     *
+     * @param tvID
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<Keyword> getTVKeywords(int tvID) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.KEYWORDS).buildUrl(parameters);
+        WrapperGenericList<Keyword> wrapper = processWrapper(getTypeReference(Keyword.class), url, "keywords");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * This method lets users rate a TV show.
+     *
+     * A valid session id or guest session id is required.
+     *
+     * @param tvID
+     * @param rating
+     * @param sessionID
+     * @param guestSessionID
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public StatusCode postTVRating(int tvID, int rating, String sessionID, String guestSessionID) throws MovieDbException {
+        if (rating < 0 || rating > RATING_MAX) {
+            throw new MovieDbException(ApiExceptionType.UNKNOWN_CAUSE, "Rating out of range");
+        }
+
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.SESSION_ID, sessionID);
+        parameters.add(Param.GUEST_SESSION_ID, guestSessionID);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.RATING).buildUrl(parameters);
+        String jsonBody = new PostTools()
+                .add(PostBody.VALUE, rating)
+                .build();
+        String webpage = httpTools.postRequest(url, jsonBody);
+
+        try {
+            return MAPPER.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to post rating", url, ex);
+        }
+    }
+
+    /**
+     * Get the similar TV shows for a specific tv id.
+     *
+     * @param tvID
+     * @param page
+     * @param language
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<TVInfo> getTVSimilar(int tvID, Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.SIMILAR).buildUrl(parameters);
+        WrapperGenericList<TVInfo> wrapper = processWrapper(getTypeReference(TVInfo.class), url, "similar TV shows");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of translations that exist for a TV series. These
+     * translations cascade down to the episode level.
+     *
+     * @param tvID
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<Translation> getTVTranslations(int tvID) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.TRANSLATIONS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperTranslations wrapper = MAPPER.readValue(webpage, WrapperTranslations.class);
+            ResultList<Translation> results = new ResultList<>(wrapper.getTranslations());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get translations", url, ex);
+        }
+    }
+
+    /**
+     * Get the videos that have been added to a TV series (trailers, opening
+     * credits, etc...)
+     *
+     * @param tvID
+     * @param language
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<Video> getTVVideos(int tvID, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, tvID);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.VIDEOS).buildUrl(parameters);
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            WrapperVideos wrapper = MAPPER.readValue(webpage, WrapperVideos.class);
+            ResultList<Video> results = new ResultList<>(wrapper.getVideos());
+            wrapper.setResultProperties(results);
+            return results;
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get videos", url, ex);
+        }
+    }
+
+    /**
+     * Get the latest TV show id.
+     *
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public TVInfo getLatestTV() throws MovieDbException {
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.LATEST).buildUrl();
+        String webpage = httpTools.getRequest(url);
+
+        try {
+            return MAPPER.readValue(webpage, TVInfo.class);
+        } catch (IOException ex) {
+            throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get latest TV show", url, ex);
+        }
+    }
+
+    /**
+     * Get the list of TV shows that are currently on the air.
+     *
+     * This query looks for any TV show that has an episode with an air date in
+     * the next 7 days.
+     *
+     * @param page
+     * @param language
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<TVInfo> getTVOnTheAir(Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.ON_THE_AIR).buildUrl(parameters);
+        WrapperGenericList<TVInfo> wrapper = processWrapper(getTypeReference(TVInfo.class), url, "on the air");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of TV shows that air today.
+     *
+     * Without a specified timezone, this query defaults to EST
+     *
+     * @param page
+     * @param language
+     * @param timezone
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<TVInfo> getTVAiringToday(Integer page, String language, String timezone) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.TIMEZONE, timezone);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.AIRING_TODAY).buildUrl(parameters);
+        WrapperGenericList<TVInfo> wrapper = processWrapper(getTypeReference(TVInfo.class), url, "airing today");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of top rated TV shows.
+     *
+     * By default, this list will only include TV shows that have 2 or more
+     * votes.
+     *
+     * This list refreshes every day.
+     *
+     * @param page
+     * @param language
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<TVInfo> getTVTopRated(Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.TOP_RATED).buildUrl(parameters);
+        WrapperGenericList<TVInfo> wrapper = processWrapper(getTypeReference(TVInfo.class), url, "top rated TV shows");
+        return wrapper.getResultsList();
+    }
+
+    /**
+     * Get the list of popular TV shows. This list refreshes every day.
+     *
+     * @param page
+     * @param language
+     * @return
+     * @throws com.omertron.themoviedbapi.MovieDbException
+     */
+    public ResultList<TVInfo> getTVPopular(Integer page, String language) throws MovieDbException {
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.LANGUAGE, language);
+
+        URL url = new ApiUrl(apiKey, MethodBase.TV).subMethod(MethodSub.POPULAR).buildUrl(parameters);
+        WrapperGenericList<TVInfo> wrapper = processWrapper(getTypeReference(TVInfo.class), url, "popular TV shows");
+        return wrapper.getResultsList();
+    }
+}

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

@@ -1,44 +1,44 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 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
+ *      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,
+ *      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, see <http://www.gnu.org/licenses/>.
+ *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
  *
  */
 package com.omertron.themoviedbapi.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonRootName;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import java.io.Serializable;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- * @author stuart.boston
+ *
+ * @author Stuart.Boston
  */
-@JsonRootName("production_company")
+public class AbstractIdName extends AbstractJsonMapping implements Serializable, Identification {
-public class ProductionCompany extends AbstractJsonMapping {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("id")
     private int id;
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    @Override
     public int getId() {
         return id;
     }
@@ -47,6 +47,7 @@ public class ProductionCompany extends AbstractJsonMapping {
         return name;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
@@ -56,28 +57,23 @@ public class ProductionCompany extends AbstractJsonMapping {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
-        if (obj == null) {
+        if (obj instanceof AbstractIdName) {
+            final AbstractIdName other = (AbstractIdName) obj;
+            return new EqualsBuilder()
+                    .append(name, other.name)
+                    .append(id, other.id)
+                    .isEquals();
+        } else {
             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;
+        return new HashCodeBuilder()
-        hash = 37 * hash + this.id;
+                .append(id)
-        hash = 37 * hash + (this.name != null ? this.name.hashCode() : 0);
+                .append(name)
-        return hash;
+                .toHashCode();
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -20,21 +20,21 @@
 package com.omertron.themoviedbapi.model;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+import java.io.Serializable;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.Serializable;
-
 /**
- * @author Holger Brandl
+ * Abstract class to handle any unknown properties by outputting a log message
+ *
+ * @author stuart.boston
  */
 public abstract class AbstractJsonMapping implements Serializable {
 
-    private static Logger getLogger(Class<?> aClass) {
+    private static final long serialVersionUID = 100L;
-        return LoggerFactory.getLogger(aClass);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractJsonMapping.class);
-    }
 
     /**
      * Handle unknown properties and print a message
@@ -43,16 +43,16 @@ public abstract class AbstractJsonMapping implements Serializable {
      * @param value
      */
     @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
+    protected void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
+        StringBuilder unknown = new StringBuilder(this.getClass().getSimpleName());
-        sb.append("Unknown property: '").append(key);
+        unknown.append(": Unknown property='").append(key);
-        sb.append("' value: '").append(value).append("'");
+        unknown.append("' value='").append(value).append("'");
 
-        getLogger(this.getClass()).warn(sb.toString());
+        LOG.trace(unknown.toString());
     }
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }

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

@@ -0,0 +1,61 @@
+/*
+ *      Copyright (c) 2004-2015 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation;private either version 3 of the License;private or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful;private
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import java.io.Serializable;
+
+@JsonRootName("certification")
+public class Certification extends AbstractJsonMapping implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+    // Properties
+    @JsonProperty("certification")
+    private String value;
+    @JsonProperty("meaning")
+    private String meaning;
+    @JsonProperty("order")
+    private int order;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getMeaning() {
+        return meaning;
+    }
+
+    public void setMeaning(String meaning) {
+        this.meaning = meaning;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    public void setOrder(int order) {
+        this.order = order;
+    }
+}

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

@@ -1,46 +0,0 @@
-package com.omertron.themoviedbapi.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ChangeKeyItem {
-
-    private static final long serialVersionUID = 1L;
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("items")
-    private List<ChangedItem> changedItems = new ArrayList<ChangedItem>();
-    private Map<String, Object> newItems = new HashMap<String, Object>();
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public List<ChangedItem> getChangedItems() {
-        return changedItems;
-    }
-
-    public void setChangedItems(List<ChangedItem> changes) {
-        this.changedItems = changes;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getNewItems() {
-        return this.newItems;
-    }
-
-    @JsonAnySetter
-    public void setNewItems(String name, Object value) {
-        this.newItems.put(name, value);
-    }
-}

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

@@ -1,74 +0,0 @@
-package com.omertron.themoviedbapi.model;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ChangedItem extends AbstractJsonMapping {
-
-    private static final long serialVersionUID = 1L;
-    @JsonProperty("id")
-    private String id;
-    @JsonProperty("action")
-    private String action;
-    @JsonProperty("time")
-    private String time;
-    @JsonProperty("iso_639_1")
-    private String language;
-    @JsonProperty("value")
-    private Object value;
-    private Map<String, Object> newItems = new HashMap<String, Object>();
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public void setTime(String time) {
-        this.time = time;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        this.value = value;
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getNewItems() {
-        return this.newItems;
-    }
-
-    @JsonAnySetter
-    public void setNewItems(String name, Object value) {
-        this.newItems.put(name, value);
-    }
-}

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

@@ -1,264 +0,0 @@
-/*
- *      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 org.apache.commons.lang3.StringUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.omertron.themoviedbapi.tools.ApiUrl.*;
-
-/**
- * Generate a discover object for use in the MovieDbApi
- * <p/>
- * This allows you to just add the search components you are concerned with
- *
- * @author stuart.boston
- */
-public class Discover {
-
-    private Map<String, String> params = new HashMap<String, String>();
-    private 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
-     * <p/>
-     * 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.
-     * <p/>
-     * Expected value is an integer (the id of a genre).
-     * <p/>
-     * Multiple values can be specified.
-     * <p/>
-     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'
-     *
-     * @param withGenres
-     */
-    public Discover withGenres(String withGenres) {
-        if (StringUtils.isNotBlank(withGenres)) {
-            params.put(PARAM_WITH_GENRES, withGenres);
-        }
-        return this;
-    }
-
-    /**
-     * The minimum release to include.
-     * <p/>
-     * 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.
-     * <p/>
-     * 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.
-     * <p/>
-     * When this value is specified, 'certificationLte' is required.
-     * <p/>
-     * 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.
-     * <p/>
-     * 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.
-     * <p/>
-     * Expected value is an integer (the id of a company).
-     * <p/>
-     * 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);
-    }
-}

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

@@ -0,0 +1,89 @@
+/*
+ *      Copyright (c) 2004-2015 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.model.person.PersonFind;
+import com.omertron.themoviedbapi.model.tv.TVBasic;
+import com.omertron.themoviedbapi.model.tv.TVEpisodeBasic;
+import com.omertron.themoviedbapi.model.tv.TVSeasonBasic;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author stuart.boston
+ */
+public class FindResults extends AbstractJsonMapping implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+
+    @JsonProperty("movie_results")
+    private List<MovieBasic> movieResults;
+    @JsonProperty("person_results")
+    private List<PersonFind> personResults;
+    @JsonProperty("tv_results")
+    private List<TVBasic> tvResults;
+    @JsonProperty("tv_season_results")
+    private List<TVSeasonBasic> tvSeasonResults;
+    @JsonProperty("tv_episode_results")
+    private List<TVEpisodeBasic> tvEpisodeResults;
+
+    public List<MovieBasic> getMovieResults() {
+        return movieResults;
+    }
+
+    public void setMovieResults(List<MovieBasic> movieResults) {
+        this.movieResults = movieResults;
+    }
+
+    public List<PersonFind> getPersonResults() {
+        return personResults;
+    }
+
+    public void setPersonResults(List<PersonFind> personResults) {
+        this.personResults = personResults;
+    }
+
+    public List<TVBasic> getTvResults() {
+        return tvResults;
+    }
+
+    public void setTvResults(List<TVBasic> tvResults) {
+        this.tvResults = tvResults;
+    }
+
+    public List<TVSeasonBasic> getTvSeasonResults() {
+        return tvSeasonResults;
+    }
+
+    public void setTvSeasonResults(List<TVSeasonBasic> tvSeasonResults) {
+        this.tvSeasonResults = tvSeasonResults;
+    }
+
+    public List<TVEpisodeBasic> getTvEpisodeResults() {
+        return tvEpisodeResults;
+    }
+
+    public void setTvEpisodeResults(List<TVEpisodeBasic> tvEpisodeResults) {
+        this.tvEpisodeResults = tvEpisodeResults;
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -19,64 +19,15 @@
  */
 package com.omertron.themoviedbapi.model;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
+import java.io.Serializable;
 
 /**
  * @author stuart.boston
  */
 @JsonRootName("genre")
-public class Genre extends AbstractJsonMapping {
+public class Genre extends AbstractIdName implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
-    /*
+    // Nothing to override from the base 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;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Genre other = (Genre) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 53 * hash + this.id;
-        hash = 53 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
 }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -21,23 +21,23 @@ package com.omertron.themoviedbapi.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
+import java.io.Serializable;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * @author stuart.boston
  */
 @JsonRootName("spoken_language")
-public class Language extends AbstractJsonMapping {
+public class Language extends AbstractJsonMapping implements Serializable {
+
+    private static final long serialVersionUID = 100L;
 
-    private static final long serialVersionUID = 1L;
-    /*
-     * 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;
     }
@@ -56,27 +56,22 @@ public class Language extends AbstractJsonMapping {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
+        if (obj instanceof Language) {
+            final Language other = (Language) obj;
+            return new EqualsBuilder()
+                    .append(isoCode, other.isoCode)
+                    .append(name, other.name)
+                    .isEquals();
+        } else {
             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;
+        return new HashCodeBuilder()
-        hash = 71 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
+                .append(isoCode)
-        hash = 71 * hash + (this.name != null ? this.name.hashCode() : 0);
+                .append(name)
-        return hash;
+                .toHashCode();
     }
 }

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

@@ -1,423 +0,0 @@
-/*
- *      Copyright (c) 2004-2013 Stuart Boston
- *
- *      This file is part of TheMovieDB API.
- *
- *      TheMovieDB API is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      any later version.
- *
- *      TheMovieDB API is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.omertron.themoviedbapi.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.wrapper.*;
-
-import java.util.List;
-
-/**
- * Movie Bean
- *
- * @author stuart.boston
- */
-public class MovieDb extends AbstractJsonMapping {
-
-    private static final long serialVersionUID = 1L;
-    /*
-     * Properties
-     */
-    @JsonProperty("backdrop_path")
-    private String backdropPath;
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("original_title")
-    private String originalTitle;
-    @JsonProperty("popularity")
-    private float popularity;
-    @JsonProperty("poster_path")
-    private String posterPath;
-    @JsonProperty("release_date")
-    private String releaseDate;
-    @JsonProperty("title")
-    private String title;
-    @JsonProperty("adult")
-    private boolean adult;
-    @JsonProperty("belongs_to_collection")
-    private Collection belongsToCollection;
-    @JsonProperty("budget")
-    private long budget;
-    @JsonProperty("genres")
-    private List<Genre> genres;
-    @JsonProperty("homepage")
-    private String homepage;
-    @JsonProperty("imdb_id")
-    private String imdbID;
-    @JsonProperty("overview")
-    private String overview;
-    @JsonProperty("production_companies")
-    private List<ProductionCompany> productionCompanies;
-    @JsonProperty("production_countries")
-    private List<ProductionCountry> productionCountries;
-    @JsonProperty("revenue")
-    private long revenue;
-    @JsonProperty("runtime")
-    private int runtime;
-    @JsonProperty("spoken_languages")
-    private List<Language> spokenLanguages;
-    @JsonProperty("tagline")
-    private String tagline;
-    @JsonProperty("rating")
-    private float userRating;
-    @JsonProperty("vote_average")
-    private float voteAverage;
-    @JsonProperty("vote_count")
-    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() {
-        return backdropPath;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getOriginalTitle() {
-        return originalTitle;
-    }
-
-    public float getPopularity() {
-        return popularity;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public boolean isAdult() {
-        return adult;
-    }
-
-    public Collection getBelongsToCollection() {
-        return belongsToCollection;
-    }
-
-    public long getBudget() {
-        return budget;
-    }
-
-    public List<Genre> getGenres() {
-        return genres;
-    }
-
-    public String getHomepage() {
-        return homepage;
-    }
-
-    public String getImdbID() {
-        return imdbID;
-    }
-
-    public String getOverview() {
-        return overview;
-    }
-
-    public List<ProductionCompany> getProductionCompanies() {
-        return productionCompanies;
-    }
-
-    public List<ProductionCountry> getProductionCountries() {
-        return productionCountries;
-    }
-
-    public long getRevenue() {
-        return revenue;
-    }
-
-    public int getRuntime() {
-        return runtime;
-    }
-
-    public List<Language> getSpokenLanguages() {
-        return spokenLanguages;
-    }
-
-    public String getTagline() {
-        return tagline;
-    }
-
-    public float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public int getVoteCount() {
-        return voteCount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public float getUserRating() {
-        return userRating;
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setOriginalTitle(String originalTitle) {
-        this.originalTitle = originalTitle;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
-
-    public void setBelongsToCollection(Collection belongsToCollection) {
-        this.belongsToCollection = belongsToCollection;
-    }
-
-    public void setBudget(long budget) {
-        this.budget = budget;
-    }
-
-    public void setGenres(List<Genre> genres) {
-        this.genres = genres;
-    }
-
-    public void setHomepage(String homepage) {
-        this.homepage = homepage;
-    }
-
-    public void setImdbID(String imdbID) {
-        this.imdbID = imdbID;
-    }
-
-    public void setOverview(String overview) {
-        this.overview = overview;
-    }
-
-    public void setProductionCompanies(List<ProductionCompany> productionCompanies) {
-        this.productionCompanies = productionCompanies;
-    }
-
-    public void setProductionCountries(List<ProductionCountry> productionCountries) {
-        this.productionCountries = productionCountries;
-    }
-
-    public void setRevenue(long revenue) {
-        this.revenue = revenue;
-    }
-
-    public void setRuntime(int runtime) {
-        this.runtime = runtime;
-    }
-
-    public void setSpokenLanguages(List<Language> spokenLanguages) {
-        this.spokenLanguages = spokenLanguages;
-    }
-
-    public void setTagline(String tagline) {
-        this.tagline = tagline;
-    }
-
-    public void setVoteAverage(float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-    public void setVoteCount(int voteCount) {
-        this.voteCount = voteCount;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public void setUserRating(float userRating) {
-        this.userRating = userRating;
-    }
-    // </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>
-
-    //<editor-fold defaultstate="collapsed" desc="Equals and HashCode">
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final MovieDb other = (MovieDb) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.imdbID == null) ? (other.imdbID != null) : !this.imdbID.equals(other.imdbID)) {
-            return false;
-        }
-        if (this.runtime != other.runtime) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 89 * hash + this.id;
-        hash = 89 * hash + (this.imdbID != null ? this.imdbID.hashCode() : 0);
-        hash = 89 * hash + this.runtime;
-        return hash;
-    }
-    // </editor-fold>
-}

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

@@ -1,299 +0,0 @@
-/*
- *      Copyright (c) 2004-2013 Stuart Boston
- *
- *      This file is part of TheMovieDB API.
- *
- *      TheMovieDB API is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      any later version.
- *
- *      TheMovieDB API is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.omertron.themoviedbapi.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author stuart.boston
- */
-public class Person extends AbstractJsonMapping {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Static fields for default cast information
-     */
-    private static final String CAST_DEPARTMENT = "acting";
-    private static final String CAST_JOB = "actor";
-    private static final String DEFAULT_STRING = "";
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id = -1;
-    @JsonProperty("name")
-    private String name = "";
-    @JsonProperty("profile_path")
-    private String profilePath = DEFAULT_STRING;
-    private PersonType personType = PersonType.PERSON;
-    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) {
-        setPersonType(PersonType.CREW);
-        setId(id);
-        setName(name);
-        setProfilePath(profilePath);
-        setDepartment(department);
-        setJob(job);
-        setCharacter("");
-        setOrder(-1);
-    }
-
-    /**
-     * Add a cast member
-     *
-     * @param id
-     * @param name
-     * @param profilePath
-     * @param character
-     * @param order
-     */
-    public void addCast(int id, String name, String profilePath, String character, int order) {
-        setPersonType(PersonType.CAST);
-        setId(id);
-        setName(name);
-        setProfilePath(profilePath);
-        setCharacter(character);
-        setOrder(order);
-        setDepartment(CAST_DEPARTMENT);
-        setJob(CAST_JOB);
-    }
-
-    // <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 = StringUtils.trimToEmpty(job);
-    }
-
-    public void setName(String name) {
-        this.name = StringUtils.trimToEmpty(name);
-    }
-
-    public void setOrder(int order) {
-        this.order = order;
-    }
-
-    public void setPersonType(PersonType personType) {
-        this.personType = personType;
-    }
-
-    public void setProfilePath(String profilePath) {
-        this.profilePath = StringUtils.trimToEmpty(profilePath);
-    }
-
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
-
-    public void setAka(List<String> aka) {
-        this.aka = aka;
-    }
-
-    public void setBiography(String biography) {
-        this.biography = StringUtils.trimToEmpty(biography);
-    }
-
-    public void setBirthday(String birthday) {
-        this.birthday = StringUtils.trimToEmpty(birthday);
-    }
-
-    public void setBirthplace(String birthplace) {
-        this.birthplace = StringUtils.trimToEmpty(birthplace);
-    }
-
-    public void setDeathday(String deathday) {
-        this.deathday = StringUtils.trimToEmpty(deathday);
-    }
-
-    public void setHomepage(String homepage) {
-        this.homepage = StringUtils.trimToEmpty(homepage);
-    }
-
-    public void setImdbId(String imdbId) {
-        this.imdbId = StringUtils.trimToEmpty(imdbId);
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-    // </editor-fold>
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Person other = (Person) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        if ((this.profilePath == null) ? (other.profilePath != null) : !this.profilePath.equals(other.profilePath)) {
-            return false;
-        }
-        if (this.personType != other.personType) {
-            return false;
-        }
-        if ((this.department == null) ? (other.department != null) : !this.department.equals(other.department)) {
-            return false;
-        }
-        if ((this.job == null) ? (other.job != null) : !this.job.equals(other.job)) {
-            return false;
-        }
-        if ((this.character == null) ? (other.character != null) : !this.character.equals(other.character)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 37 * hash + this.id;
-        hash = 37 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 37 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
-        hash = 37 * hash + (this.personType != null ? this.personType.hashCode() : 0);
-        hash = 37 * hash + (this.department != null ? this.department.hashCode() : 0);
-        hash = 37 * hash + (this.job != null ? this.job.hashCode() : 0);
-        hash = 37 * hash + (this.character != null ? this.character.hashCode() : 0);
-        return hash;
-    }
-}

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

@@ -1,134 +0,0 @@
-/*
- *      Copyright (c) 2004-2013 Stuart Boston
- *
- *      This file is part of TheMovieDB API.
- *
- *      TheMovieDB API is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      any later version.
- *
- *      TheMovieDB API is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.omertron.themoviedbapi.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * @author Stuart
- */
-public class PersonCast extends AbstractJsonMapping {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("character")
-    private String character;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("order")
-    private int order;
-    @JsonProperty("profile_path")
-    private String profilePath;
-    @JsonProperty("cast_id")
-    private int castId;
-
-    //<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;
-    }
-
-    public void setCharacter(String character) {
-        this.character = StringUtils.trimToEmpty(character);
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setName(String name) {
-        this.name = StringUtils.trimToEmpty(name);
-    }
-
-    public void setOrder(int order) {
-        this.order = order;
-    }
-
-    public void setProfilePath(String profilePath) {
-        this.profilePath = StringUtils.trimToEmpty(profilePath);
-    }
-
-    public void setCastId(int castId) {
-        this.castId = castId;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final PersonCast other = (PersonCast) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.character == null) ? (other.character != null) : !this.character.equals(other.character)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        if (this.order != other.order) {
-            return false;
-        }
-        if ((this.profilePath == null) ? (other.profilePath != null) : !this.profilePath.equals(other.profilePath)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 41 * hash + this.id;
-        hash = 41 * hash + (this.character != null ? this.character.hashCode() : 0);
-        hash = 41 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 41 * hash + this.order;
-        hash = 41 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
-        return hash;
-    }
-}

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

@@ -1,135 +0,0 @@
-/*
- *      Copyright (c) 2004-2013 Stuart Boston
- *
- *      This file is part of TheMovieDB API.
- *
- *      TheMovieDB API is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      any later version.
- *
- *      TheMovieDB API is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.omertron.themoviedbapi.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * @author stuart.boston
- */
-public class PersonCredit extends AbstractJsonMapping {
-
-    private static final long serialVersionUID = 1L;
-    private static final String DEFAULT_STRING = "";
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int movieId = 0;
-    @JsonProperty("character")
-    private String character = DEFAULT_STRING;
-    @JsonProperty("original_title")
-    private String movieOriginalTitle = DEFAULT_STRING;
-    @JsonProperty("poster_path")
-    private String posterPath = DEFAULT_STRING;
-    @JsonProperty("release_date")
-    private String releaseDate = DEFAULT_STRING;
-    @JsonProperty("title")
-    private String movieTitle = DEFAULT_STRING;
-    @JsonProperty("department")
-    private String department = DEFAULT_STRING;
-    @JsonProperty("job")
-    private String job = DEFAULT_STRING;
-    @JsonProperty("adult")
-    private String adult = DEFAULT_STRING;
-    private PersonType personType = PersonType.PERSON;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
-    public String getCharacter() {
-        return character;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public String getJob() {
-        return job;
-    }
-
-    public int getMovieId() {
-        return movieId;
-    }
-
-    public String getMovieOriginalTitle() {
-        return movieOriginalTitle;
-    }
-
-    public String getMovieTitle() {
-        return movieTitle;
-    }
-
-    public PersonType getPersonType() {
-        return personType;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public String getAdult() {
-        return adult;
-    }
-
-    public void setCharacter(String character) {
-        this.character = StringUtils.trimToEmpty(character);
-    }
-
-    public void setDepartment(String department) {
-        this.department = StringUtils.trimToEmpty(department);
-    }
-
-    public void setJob(String job) {
-        this.job = StringUtils.trimToEmpty(job);
-    }
-
-    public void setMovieId(int movieId) {
-        this.movieId = movieId;
-    }
-
-    public void setMovieOriginalTitle(String movieOriginalTitle) {
-        this.movieOriginalTitle = StringUtils.trimToEmpty(movieOriginalTitle);
-    }
-
-    public void setMovieTitle(String movieTitle) {
-        this.movieTitle = StringUtils.trimToEmpty(movieTitle);
-    }
-
-    public void setPersonType(PersonType personType) {
-        this.personType = personType;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = StringUtils.trimToEmpty(posterPath);
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = StringUtils.trimToEmpty(releaseDate);
-    }
-
-    public void setAdult(String adult) {
-        this.adult = StringUtils.trimToEmpty(adult);
-    }
-}

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

@@ -1,121 +0,0 @@
-/*
- *      Copyright (c) 2004-2013 Stuart Boston
- *
- *      This file is part of TheMovieDB API.
- *
- *      TheMovieDB API is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      any later version.
- *
- *      TheMovieDB API is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.omertron.themoviedbapi.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * @author Stuart
- */
-public class PersonCrew extends AbstractJsonMapping {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("department")
-    private String department;
-    @JsonProperty("job")
-    private String job;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("profile_path")
-    private String profilePath;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getDepartment() {
-        return department;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getJob() {
-        return job;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getProfilePath() {
-        return profilePath;
-    }
-
-    public void setDepartment(String department) {
-        this.department = StringUtils.trimToEmpty(department);
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setJob(String job) {
-        this.job = StringUtils.trimToEmpty(job);
-    }
-
-    public void setName(String name) {
-        this.name = StringUtils.trimToEmpty(name);
-    }
-
-    public void setProfilePath(String profilePath) {
-        this.profilePath = StringUtils.trimToEmpty(profilePath);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final PersonCrew other = (PersonCrew) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.department == null) ? (other.department != null) : !this.department.equals(other.department)) {
-            return false;
-        }
-        if ((this.job == null) ? (other.job != null) : !this.job.equals(other.job)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 59 * hash + this.id;
-        hash = 59 * hash + (this.department != null ? this.department.hashCode() : 0);
-        hash = 59 * hash + (this.job != null ? this.job.hashCode() : 0);
-        hash = 59 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 59 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
-        return hash;
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -26,30 +26,26 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class StatusCode extends AbstractJsonMapping {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("status_code")
-    private int statusCode;
+    private int code;
     @JsonProperty("status_message")
-    private String statusMessage;
+    private String message;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    public int getCode() {
-    public int getStatusCode() {
+        return code;
-        return statusCode;
     }
 
-    public void setStatusCode(int statusCode) {
+    public void setCode(int code) {
-        this.statusCode = statusCode;
+        this.code = code;
     }
 
-    public String getStatusMessage() {
+    public String getMessage() {
-        return statusMessage;
+        return message;
     }
 
-    public void setStatusMessage(String statusMessage) {
+    public void setMessage(String message) {
-        this.statusMessage = statusMessage;
+        this.message = message;
     }
 }

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

@@ -1,105 +0,0 @@
-/*
- *      Copyright (c) 2004-2013 Stuart Boston
- *
- *      This file is part of TheMovieDB API.
- *
- *      TheMovieDB API is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      any later version.
- *
- *      TheMovieDB API is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.omertron.themoviedbapi.model;
-
-/**
- * @author Stuart
- */
-public class Trailer extends AbstractJsonMapping {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Website sources
-     */
-    public static final String WEBSITE_YOUTUBE = "youtube";
-    public static final String WEBSITE_QUICKTIME = "quicktime";
-    /*
-     * Properties
-     */
-    private String name;
-    private String size;
-    private String source;
-    private String website;    // The website of the trailer
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getName() {
-        return name;
-    }
-
-    public String getSize() {
-        return size;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public String getWebsite() {
-        return website;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setSize(String size) {
-        this.size = size;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    public void setWebsite(String website) {
-        this.website = website;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Trailer other = (Trailer) obj;
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        if ((this.size == null) ? (other.size != null) : !this.size.equals(other.size)) {
-            return false;
-        }
-        if ((this.source == null) ? (other.source != null) : !this.source.equals(other.source)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 61 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 61 * hash + (this.size != null ? this.size.hashCode() : 0);
-        hash = 61 * hash + (this.source != null ? this.source.hashCode() : 0);
-        hash = 61 * hash + (this.website != null ? this.website.hashCode() : 0);
-        return hash;
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,11 +17,15 @@
  *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.account;
 
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.interfaces.Identification;
 
-public class Account extends AbstractJsonMapping {
+public class Account extends AbstractJsonMapping implements Identification {
+
+    private static final long serialVersionUID = 100L;
 
     @JsonProperty("id")
     private int id;
@@ -31,11 +35,19 @@ public class Account extends AbstractJsonMapping {
     private String userName;
     @JsonProperty("include_adult")
     private boolean includeAdult;
+    @JsonProperty("iso_639_1")
+    private String language;
+    @JsonProperty("iso_3166_1")
+    private String country;
+    @JsonProperty("avatar")
+    private Avatar avatar;
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
@@ -63,4 +75,28 @@ public class Account extends AbstractJsonMapping {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public Avatar getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(Avatar avatar) {
+        this.avatar = avatar;
+    }
 }

src/main/java/com/omertron/themoviedbapi/model/account/Avatar.java

@@ -0,0 +1,38 @@
+/*
+ *      Copyright (c) 2004-2015 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.account;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+
+public class Avatar extends AbstractJsonMapping {
+
+    @JsonProperty("gravatar")
+    private AvatarHash hash = null;
+
+    public String getHash() {
+        return hash == null ? "" : hash.getHash();
+    }
+
+    public void setHash(AvatarHash hash) {
+        this.hash = hash;
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/model/account/AvatarHash.java

@@ -0,0 +1,38 @@
+/*
+ *      Copyright (c) 2004-2015 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.account;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+
+public class AvatarHash extends AbstractJsonMapping {
+
+    @JsonProperty("hash")
+    private String hash;
+
+    public String getHash() {
+        return hash;
+    }
+
+    public void setHash(String hash) {
+        this.hash = hash;
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,22 +17,27 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.artwork;
 
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.enumeration.ArtworkType;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import java.io.Serializable;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * The artwork type information
  *
  * @author Stuart
  */
-public class Artwork extends AbstractJsonMapping {
+public class Artwork extends AbstractJsonMapping implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
+    @JsonProperty("id")
-     * Properties
+    private String id;
-     */
     @JsonProperty("aspect_ratio")
     private float aspectRatio;
     @JsonProperty("file_path")
@@ -51,121 +56,117 @@ public class Artwork extends AbstractJsonMapping {
     private String flag;
     private ArtworkType artworkType = ArtworkType.POSTER;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
+    public String getId() {
-    public ArtworkType getArtworkType() {
+        return id;
-        return artworkType;
+    }
+
+    public void setId(String id) {
+        this.id = id;
     }
 
     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 String getFilePath() {
+        return filePath;
+    }
+
     public void setFilePath(String filePath) {
         this.filePath = filePath;
     }
 
+    public int getHeight() {
+        return height;
+    }
+
     public void setHeight(int height) {
         this.height = height;
     }
 
+    public String getLanguage() {
+        return language;
+    }
+
     public void setLanguage(String language) {
         this.language = language;
     }
 
+    public int getWidth() {
+        return width;
+    }
+
     public void setWidth(int width) {
         this.width = width;
     }
 
+    public float getVoteAverage() {
+        return voteAverage;
+    }
+
     public void setVoteAverage(float voteAverage) {
         this.voteAverage = voteAverage;
     }
 
+    public int getVoteCount() {
+        return voteCount;
+    }
+
     public void setVoteCount(int voteCount) {
         this.voteCount = voteCount;
     }
 
+    public String getFlag() {
+        return flag;
+    }
+
     public void setFlag(String flag) {
         this.flag = flag;
     }
-    // </editor-fold>
+
+    public ArtworkType getArtworkType() {
+        return artworkType;
+    }
+
+    public void setArtworkType(ArtworkType artworkType) {
+        this.artworkType = artworkType;
+    }
+
+    @JsonSetter("image_type")
+    public void setArtworkType(String artworkType) {
+        this.artworkType = ArtworkType.fromString(artworkType);
+    }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
+        if (obj instanceof Artwork) {
+            final Artwork other = (Artwork) obj;
+            return new EqualsBuilder()
+                    .append(aspectRatio, other.aspectRatio)
+                    .append(filePath, other.filePath)
+                    .append(language, other.language)
+                    .append(height, other.height)
+                    .append(width, other.width)
+                    .append(artworkType, other.artworkType)
+                    .isEquals();
+        } else {
             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;
+        return new HashCodeBuilder()
-        hash = 71 * hash + Float.floatToIntBits(this.aspectRatio);
+                .append(aspectRatio)
-        hash = 71 * hash + (this.filePath != null ? this.filePath.hashCode() : 0);
+                .append(filePath)
-        hash = 71 * hash + this.height;
+                .append(height)
-        hash = 71 * hash + (this.language != null ? this.language.hashCode() : 0);
+                .append(width)
-        hash = 71 * hash + this.width;
+                .append(language)
-        hash = 71 * hash + (this.artworkType != null ? this.artworkType.hashCode() : 0);
+                .append(artworkType)
-        return hash;
+                .toHashCode();
     }
 }

src/main/java/com/omertron/themoviedbapi/model/artwork/ArtworkMedia.java

@@ -0,0 +1,100 @@
+/*
+ *      Copyright (c) 2004-2015 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.artwork;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.omertron.themoviedbapi.enumeration.MediaType;
+import com.omertron.themoviedbapi.model.media.MediaBasic;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.model.tv.TVBasic;
+import com.omertron.themoviedbapi.model.tv.TVEpisodeBasic;
+import java.io.Serializable;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
+/**
+ *
+ * @author Stuart
+ */
+public class ArtworkMedia extends Artwork implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+
+    private MediaType mediaType;
+    @JsonTypeInfo(
+            use = JsonTypeInfo.Id.NAME,
+            include = JsonTypeInfo.As.EXTERNAL_PROPERTY,
+            property = "media_type",
+            defaultImpl = MediaBasic.class
+    )
+    @JsonSubTypes({
+        @JsonSubTypes.Type(value = MovieBasic.class, name = "movie"),
+        @JsonSubTypes.Type(value = TVBasic.class, name = "tv"),
+        @JsonSubTypes.Type(value = TVEpisodeBasic.class, name = "episode")
+    })
+    @JsonProperty("media")
+    private MediaBasic media;
+
+    public MediaType getMediaType() {
+        return mediaType;
+    }
+
+    public void setMediaType(MediaType mediaType) {
+        this.mediaType = mediaType;
+    }
+
+    @JsonSetter("media_type")
+    public void setMediaType(String mediaType) {
+        this.mediaType = MediaType.fromString(mediaType);
+    }
+
+    public MediaBasic getMedia() {
+        return media;
+    }
+
+    public void setMedia(MediaBasic media) {
+        this.media = media;
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .appendSuper(super.hashCode())
+                .append(mediaType)
+                .toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ArtworkMedia) {
+            final ArtworkMedia other = (ArtworkMedia) obj;
+            return new EqualsBuilder()
+                    .appendSuper(super.equals(obj))
+                    .append(mediaType, other.mediaType)
+                    .isEquals();
+        } else {
+            return false;
+        }
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,17 +17,15 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.authentication;
 
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.io.Serializable;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
-public class TokenAuthorisation {
+public class TokenAuthorisation extends AbstractJsonMapping implements Serializable {
 
-    /*
+    private static final long serialVersionUID = 100L;
-     * Properties
-     */
     @JsonProperty("expires_at")
     private String expires;
     @JsonProperty("request_token")
@@ -35,7 +33,6 @@ public class TokenAuthorisation {
     @JsonProperty("success")
     private Boolean success;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getExpires() {
         return expires;
     }
@@ -47,9 +44,7 @@ public class TokenAuthorisation {
     public Boolean getSuccess() {
         return success;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setExpires(String expires) {
         this.expires = expires;
     }
@@ -61,10 +56,4 @@ public class TokenAuthorisation {
     public void setSuccess(Boolean success) {
         this.success = success;
     }
-    // </editor-fold>
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
 }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,17 +17,15 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.authentication;
 
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.io.Serializable;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
-public class TokenSession {
+public class TokenSession extends AbstractJsonMapping implements Serializable {
 
-    /*
+    private static final long serialVersionUID = 100L;
-     * Properties
-     */
     @JsonProperty("session_id")
     private String sessionId;
     @JsonProperty("success")
@@ -41,7 +39,6 @@ public class TokenSession {
     @JsonProperty("expires_at")
     private String expiresAt;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getSessionId() {
         return sessionId;
     }
@@ -65,9 +62,7 @@ public class TokenSession {
     public String getExpiresAt() {
         return expiresAt;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
@@ -91,10 +86,4 @@ public class TokenSession {
     public void setExpiresAt(String expiresAt) {
         this.expiresAt = expiresAt;
     }
-    // </editor-fold>
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
 }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,30 +17,36 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.model.change;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.KeywordMovie;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
-/**
+public class ChangeKeyItem extends AbstractJsonMapping implements Serializable {
- *
- * @author stuart.boston
- */
-public class WrapperKeywordMovies extends AbstractWrapperAll {
 
-    @JsonProperty("results")
+    private static final long serialVersionUID = 100L;
-    private List<KeywordMovie> results;
+    @JsonProperty("key")
+    private String key;
+    @JsonProperty("items")
+    private List<ChangedItem> changedItems = new ArrayList<>();
 
-    public WrapperKeywordMovies() {
+    public String getKey() {
-        super(WrapperKeywordMovies.class);
+        return key;
     }
 
-    public List<KeywordMovie> getResults() {
+    public void setKey(String key) {
-        return results;
+        this.key = key;
     }
 
-    public void setResults(List<KeywordMovie> results) {
+    public List<ChangedItem> getChangedItems() {
-        this.results = results;
+        return changedItems;
     }
+
+    public void setChangedItems(List<ChangedItem> changes) {
+        this.changedItems = changes;
+    }
+
 }

src/main/java/com/omertron/themoviedbapi/model/change/ChangeListItem.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,30 +17,34 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.model.change;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.Collection;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
-import java.util.List;
+import java.io.Serializable;
 
-/**
+public class ChangeListItem extends AbstractJsonMapping implements Serializable {
- *
- * @author stuart.boston
- */
-public class WrapperCollection extends AbstractWrapperAll {
 
-    @JsonProperty("results")
+    private static final long serialVersionUID = 100L;
-    private List<Collection> results;
 
-    public WrapperCollection() {
+    @JsonProperty("id")
-        super(WrapperCollection.class);
+    private int id;
+    @JsonProperty("adult")
+    private boolean adult;
+
+    public int getId() {
+        return id;
     }
 
-    public List<Collection> getResults() {
+    public boolean isAdult() {
-        return results;
+        return adult;
     }
 
-    public void setResults(List<Collection> results) {
+    public void setId(int id) {
-        this.results = results;
+        this.id = id;
+    }
+
+    public void setAdult(boolean adult) {
+        this.adult = adult;
     }
 }

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

@@ -0,0 +1,90 @@
+/*
+ *      Copyright (c) 2004-2015 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.change;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
+
+public class ChangedItem extends AbstractJsonMapping implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("action")
+    private String action;
+    @JsonProperty("time")
+    private String time;
+    @JsonProperty("iso_639_1")
+    private String language;
+    @JsonProperty("value")
+    private Object value;
+    @JsonProperty("original_value")
+    private Object originalValue;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public Object getOriginalValue() {
+        return originalValue;
+    }
+
+    public void setOriginalValue(Object originalValue) {
+        this.originalValue = originalValue;
+    }
+
+}

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,23 +17,25 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.collection;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * @author stuart.boston
  */
 @JsonRootName("collection")
-public class Collection extends AbstractJsonMapping {
+public class Collection extends AbstractJsonMapping implements Serializable, Identification {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("id")
     private int id;
     @JsonProperty("title")
@@ -47,11 +49,11 @@ public class Collection extends AbstractJsonMapping {
     @JsonProperty("release_date")
     private String releaseDate;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getBackdropPath() {
         return backdropPath;
     }
 
+    @Override
     public int getId() {
         return id;
     }
@@ -82,6 +84,7 @@ public class Collection extends AbstractJsonMapping {
         this.backdropPath = backdropPath;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
@@ -104,37 +107,28 @@ public class Collection extends AbstractJsonMapping {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
+        if (obj instanceof Collection) {
+            final Collection other = (Collection) obj;
+            return new EqualsBuilder()
+                    .append(id, other.id)
+                    .append(name, other.name)
+                    .append(title, other.title)
+                    .append(backdropPath, other.backdropPath)
+                    .isEquals();
+        } else {
             return false;
         }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Collection other = (Collection) obj;
-        if ((this.backdropPath == null) ? (other.backdropPath != null) : !this.backdropPath.equals(other.backdropPath)) {
-            return false;
-        }
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.title == null) ? (other.title != null) : !this.title.equals(other.title)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
     }
 
     @Override
     public int hashCode() {
-        int hash = 7;
+        return new HashCodeBuilder()
-        hash = 19 * hash + (this.backdropPath != null ? this.backdropPath.hashCode() : 0);
+                .append(id)
-        hash = 19 * hash + this.id;
+                .append(backdropPath)
-        hash = 19 * hash + (this.title != null ? this.title.hashCode() : 0);
+                .append(title)
-        hash = 19 * hash + (this.name != null ? this.name.hashCode() : 0);
+                .append(name)
-        hash = 19 * hash + (this.posterPath != null ? this.posterPath.hashCode() : 0);
+                .append(posterPath)
-        hash = 19 * hash + (this.releaseDate != null ? this.releaseDate.hashCode() : 0);
+                .append(releaseDate)
-        return hash;
+                .toHashCode();
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,9 +17,12 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.collection;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,13 +30,10 @@ import java.util.List;
 /**
  * @author Stuart
  */
-public class CollectionInfo extends AbstractJsonMapping {
+public class CollectionInfo extends AbstractJsonMapping implements Serializable, Identification {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("id")
     private int id;
     @JsonProperty("name")
@@ -45,13 +45,13 @@ public class CollectionInfo extends AbstractJsonMapping {
     @JsonProperty("backdrop_path")
     private String backdropPath;
     @JsonProperty("parts")
-    private List<Collection> parts = new ArrayList<Collection>();
+    private List<Collection> parts = new ArrayList<>();
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getBackdropPath() {
         return backdropPath;
     }
 
+    @Override
     public int getId() {
         return id;
     }
@@ -76,6 +76,7 @@ public class CollectionInfo extends AbstractJsonMapping {
         this.backdropPath = backdropPath;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,38 +17,41 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.company;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import java.io.Serializable;
+import static org.apache.commons.lang3.StringUtils.EMPTY;
 
 /**
  * Company information
  *
  * @author Stuart
  */
-public class Company extends AbstractJsonMapping {
+public class Company extends AbstractJsonMapping implements Serializable, Identification {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
-    private static final String DEFAULT_STRING = "";
     // Properties
     @JsonProperty("id")
-    private int companyId = 0;
+    private int id = 0;
     @JsonProperty("name")
-    private String name = DEFAULT_STRING;
+    private String name = EMPTY;
     @JsonProperty("description")
-    private String description = DEFAULT_STRING;
+    private String description = EMPTY;
     @JsonProperty("headquarters")
-    private String headquarters = DEFAULT_STRING;
+    private String headquarters = EMPTY;
     @JsonProperty("homepage")
-    private String homepage = DEFAULT_STRING;
+    private String homepage = EMPTY;
     @JsonProperty("logo_path")
-    private String logoPath = DEFAULT_STRING;
+    private String logoPath = EMPTY;
     @JsonProperty("parent_company")
     private Company parentCompany = null;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
+    @Override
-    public int getCompanyId() {
+    public int getId() {
-        return companyId;
+        return id;
     }
 
     public String getDescription() {
@@ -75,8 +78,9 @@ public class Company extends AbstractJsonMapping {
         return parentCompany;
     }
 
-    public void setCompanyId(int companyId) {
+    @Override
-        this.companyId = companyId;
+    public void setId(int id) {
+        this.id = id;
     }
 
     public void setDescription(String description) {
@@ -105,7 +109,7 @@ public class Company extends AbstractJsonMapping {
 
     public void setParentCompany(int id, String name, String logoPath) {
         Company parent = new Company();
-        parent.setCompanyId(companyId);
+        parent.setId(id);
         parent.setName(name);
         parent.setLogoPath(logoPath);
         this.parentCompany = parent;

src/main/java/com/omertron/themoviedbapi/model/config/Configuration.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,22 +17,25 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.StringUtils;
+import com.omertron.themoviedbapi.MovieDbException;
-
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.yamj.api.common.exception.ApiExceptionType;
 
 /**
  * @author stuart.boston
  */
-public class TmdbConfiguration extends AbstractJsonMapping {
+public class Configuration extends AbstractJsonMapping implements Serializable {
+
+    private static final long serialVersionUID = 100L;
 
-    private static final long serialVersionUID = 1L;
-    /*
-     * Properties
-     */
     @JsonProperty("base_url")
     private String baseUrl;
     @JsonProperty("secure_base_url")
@@ -45,8 +48,9 @@ public class TmdbConfiguration extends AbstractJsonMapping {
     private List<String> profileSizes;
     @JsonProperty("logo_sizes")
     private List<String> logoSizes;
+    @JsonProperty("still_sizes")
+    private List<String> stillSizes;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">//GEN-BEGIN:getterMethods
     public List<String> getBackdropSizes() {
         return backdropSizes;
     }
@@ -71,8 +75,10 @@ public class TmdbConfiguration extends AbstractJsonMapping {
         return secureBaseUrl;
     }
 
-    // </editor-fold>
+    public List<String> getStillSizes() {
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">//GEN-BEGIN:setterMethods
+        return stillSizes;
+    }
+
     public void setBackdropSizes(List<String> backdropSizes) {
         this.backdropSizes = backdropSizes;
     }
@@ -96,14 +102,17 @@ public class TmdbConfiguration extends AbstractJsonMapping {
     public void setSecureBaseUrl(String secureBaseUrl) {
         this.secureBaseUrl = secureBaseUrl;
     }
-    // </editor-fold>
+
+    public void setStillSizes(List<String> stillSizes) {
+        this.stillSizes = stillSizes;
+    }
 
     /**
      * Copy the data from the passed object to this one
      *
      * @param config
      */
-    public void clone(TmdbConfiguration config) {
+    public void clone(Configuration config) {
         backdropSizes = config.getBackdropSizes();
         baseUrl = config.getBaseUrl();
         posterSizes = config.getPosterSizes();
@@ -115,6 +124,7 @@ public class TmdbConfiguration extends AbstractJsonMapping {
      * Check that the poster size is valid
      *
      * @param posterSize
+     * @return
      */
     public boolean isValidPosterSize(String posterSize) {
         if (StringUtils.isBlank(posterSize) || posterSizes.isEmpty()) {
@@ -127,6 +137,7 @@ public class TmdbConfiguration extends AbstractJsonMapping {
      * Check that the backdrop size is valid
      *
      * @param backdropSize
+     * @return
      */
     public boolean isValidBackdropSize(String backdropSize) {
         if (StringUtils.isBlank(backdropSize) || backdropSizes.isEmpty()) {
@@ -139,6 +150,7 @@ public class TmdbConfiguration extends AbstractJsonMapping {
      * Check that the profile size is valid
      *
      * @param profileSize
+     * @return
      */
     public boolean isValidProfileSize(String profileSize) {
         if (StringUtils.isBlank(profileSize) || profileSizes.isEmpty()) {
@@ -151,6 +163,7 @@ public class TmdbConfiguration extends AbstractJsonMapping {
      * Check that the logo size is valid
      *
      * @param logoSize
+     * @return
      */
     public boolean isValidLogoSize(String logoSize) {
         if (StringUtils.isBlank(logoSize) || logoSizes.isEmpty()) {
@@ -163,11 +176,37 @@ public class TmdbConfiguration extends AbstractJsonMapping {
      * 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)
+        return isValidPosterSize(sizeToCheck)
                 || isValidBackdropSize(sizeToCheck)
                 || isValidProfileSize(sizeToCheck)
-                || isValidLogoSize(sizeToCheck));
+                || isValidLogoSize(sizeToCheck);
     }
+
+    /**
+     * Generate the full image URL from the size and image path
+     *
+     * @param imagePath
+     * @param requiredSize
+     * @return
+     * @throws MovieDbException
+     */
+    public URL createImageUrl(String imagePath, String requiredSize) throws MovieDbException {
+        if (!isValidSize(requiredSize)) {
+            throw new MovieDbException(ApiExceptionType.INVALID_IMAGE, "Required size '" + requiredSize + "' is not valid");
+        }
+
+        StringBuilder sb = new StringBuilder(getBaseUrl());
+        sb.append(requiredSize);
+        sb.append(imagePath);
+
+        try {
+            return new URL(sb.toString());
+        } catch (MalformedURLException ex) {
+            throw new MovieDbException(ApiExceptionType.INVALID_URL, "Failed to create image URL", sb.toString(), ex);
+        }
+    }
+
 }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,22 +17,22 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
 import java.util.List;
 
-public class JobDepartment {
+public class JobDepartment extends AbstractJsonMapping implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
     // Properties
     @JsonProperty("department")
     private String department;
     @JsonProperty("job_list")
     private List<String> jobs;
 
-    //<editor-fold defaultstate="collapsed" desc="Getters">
     public String getDepartment() {
         return department;
     }
@@ -41,7 +41,6 @@ public class JobDepartment {
         return jobs;
     }
 
-    //<editor-fold defaultstate="collapsed" desc="Setters">
     public void setDepartment(String department) {
         this.department = department;
     }

src/main/java/com/omertron/themoviedbapi/model/credits/CreditBasic.java

@@ -0,0 +1,131 @@
+
+/*
+ *      Copyright (c) 2004-2015 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.credits;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.omertron.themoviedbapi.enumeration.CreditType;
+import com.omertron.themoviedbapi.enumeration.MediaType;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
+
+/**
+ * @author stuart.boston
+ */
+public class CreditBasic extends AbstractJsonMapping implements Serializable, Identification {
+
+    private static final long serialVersionUID = 100L;
+
+    private CreditType creditType;
+    private MediaType mediaType;
+
+    @JsonProperty("credit_id")
+    private String creditId;
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("poster_path")
+    private String artworkPath;
+
+    //cast
+    @JsonProperty("character")
+    private String character;
+    //crew
+    @JsonProperty("department")
+    private String department;
+    @JsonProperty("job")
+    private String job;
+
+    public CreditType getCreditType() {
+        return creditType;
+    }
+
+    public void setCreditType(CreditType creditType) {
+        this.creditType = creditType;
+    }
+
+    public MediaType getMediaType() {
+        return mediaType;
+    }
+
+    @JsonSetter("media_type")
+    public void setMediaType(String mediaType) {
+        this.mediaType = MediaType.fromString(mediaType);
+    }
+
+    public void setMediaType(MediaType mediaType) {
+        this.mediaType = mediaType;
+    }
+
+    public String getCreditId() {
+        return creditId;
+    }
+
+    public void setCreditId(String creditId) {
+        this.creditId = creditId;
+    }
+
+    @Override
+    public int getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getArtworkPath() {
+        return artworkPath;
+    }
+
+    public void setArtworkPath(String artworkPath) {
+        this.artworkPath = artworkPath;
+    }
+
+    public String getCharacter() {
+        return character;
+    }
+
+    public void setCharacter(String character) {
+        this.character = character;
+        setCreditType(CreditType.CAST);
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+        setCreditType(CreditType.CREW);
+    }
+
+    public String getJob() {
+        return job;
+    }
+
+    public void setJob(String job) {
+        this.job = job;
+        setCreditType(CreditType.CREW);
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/model/credits/CreditMovieBasic.java

@@ -0,0 +1,78 @@
+/*
+ *      Copyright (c) 2004-2015 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.credits;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.enumeration.MediaType;
+import java.io.Serializable;
+
+/**
+ * @author stuart.boston
+ */
+public class CreditMovieBasic extends CreditBasic implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+
+    @JsonProperty("adult")
+    private boolean adult;
+    @JsonProperty("original_title")
+    private String originalTitle;
+    @JsonProperty("release_date")
+    private String releaseDate;
+    @JsonProperty("title")
+    private String title;
+
+    public CreditMovieBasic() {
+        setMediaType(MediaType.MOVIE);
+    }
+
+    public boolean isAdult() {
+        return adult;
+    }
+
+    public void setAdult(boolean adult) {
+        this.adult = adult;
+    }
+
+    public String getOriginalTitle() {
+        return originalTitle;
+    }
+
+    public void setOriginalTitle(String originalTitle) {
+        this.originalTitle = originalTitle;
+    }
+
+    public String getReleaseDate() {
+        return releaseDate;
+    }
+
+    public void setReleaseDate(String releaseDate) {
+        this.releaseDate = releaseDate;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/model/credits/CreditTVBasic.java

@@ -0,0 +1,78 @@
+/*
+ *      Copyright (c) 2004-2015 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.credits;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.enumeration.MediaType;
+import java.io.Serializable;
+
+/**
+ * @author stuart.boston
+ */
+public class CreditTVBasic extends CreditBasic implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+
+    @JsonProperty("episode_count")
+    private int episodeCount;
+    @JsonProperty("first_air_date")
+    private String firstAirDate;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("original_name")
+    private String originalName;
+
+    public CreditTVBasic() {
+        setMediaType(MediaType.TV);
+    }
+
+    public int getEpisodeCount() {
+        return episodeCount;
+    }
+
+    public void setEpisodeCount(int episodeCount) {
+        this.episodeCount = episodeCount;
+    }
+
+    public String getFirstAirDate() {
+        return firstAirDate;
+    }
+
+    public void setFirstAirDate(String firstAirDate) {
+        this.firstAirDate = firstAirDate;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOriginalName() {
+        return originalName;
+    }
+
+    public void setOriginalName(String originalName) {
+        this.originalName = originalName;
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/model/credits/MediaCredit.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,67 +17,62 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.credits;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonRootName;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
 
 /**
- * @author stuart.boston
+ *
+ * @author Stuart.Boston
  */
-@JsonRootName("keyword")
+public class MediaCredit extends AbstractJsonMapping implements Serializable, Identification {
-public class Keyword extends AbstractJsonMapping {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
+    @JsonProperty("credit_id")
-     * Properties
+    private String creditId;
-     */
     @JsonProperty("id")
     private int id;
+    @JsonProperty("profile_path")
+    private String artworkPath;
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
+    public String getCreditId() {
+        return creditId;
+    }
+
+    public void setCreditId(String creditId) {
+        this.creditId = creditId;
+    }
+
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getArtworkPath() {
+        return artworkPath;
+    }
+
+    public void setArtworkPath(String artworkPath) {
+        this.artworkPath = artworkPath;
+    }
+
     public String getName() {
         return name;
     }
 
-    public void setId(int id) {
-        this.id = id;
-    }
-
     public void setName(String name) {
         this.name = name;
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Keyword other = (Keyword) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 83 * hash + this.id;
-        hash = 83 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/credits/MediaCreditCast.java

@@ -0,0 +1,64 @@
+/*
+ *      Copyright (c) 2004-2015 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.credits;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+
+/**
+ *
+ * @author Stuart.Boston
+ */
+public class MediaCreditCast extends MediaCredit implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+
+    @JsonProperty("cast_id")
+    private int castId = 0;
+    @JsonProperty("character")
+    private String character;
+    @JsonProperty("order")
+    private int order;
+
+    public int getCastId() {
+        return castId;
+    }
+
+    public void setCastId(int castId) {
+        this.castId = castId;
+    }
+
+    public String getCharacter() {
+        return character;
+    }
+
+    public void setCharacter(String character) {
+        this.character = character;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/model/credits/MediaCreditCrew.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2004-2015 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.credits;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+
+/**
+ *
+ * @author Stuart.Boston
+ */
+public class MediaCreditCrew extends MediaCredit implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+
+    @JsonProperty("department")
+    private String department;
+    @JsonProperty("job")
+    private String job;
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getJob() {
+        return job;
+    }
+
+    public void setJob(String job) {
+        this.job = job;
+    }
+
+}

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

@@ -0,0 +1,506 @@
+/*
+ *      Copyright (c) 2004-2015 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.discover;
+
+import com.omertron.themoviedbapi.enumeration.SortBy;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
+
+/**
+ * Generate a discover object for use in the MovieDbApi
+ * <p/>
+ * This allows you to just add the search components you are concerned with
+ *
+ * @author stuart.boston
+ */
+public class Discover {
+
+    private final TmdbParameters params = new TmdbParameters();
+
+    private static final int YEAR_MIN = 1900;
+    private static final int YEAR_MAX = 2100;
+
+    /**
+     * Get the parameters
+     * <p/>
+     * This will be used to construct the URL in the API
+     *
+     * @return
+     */
+    public TmdbParameters getParams() {
+        return params;
+    }
+
+    /**
+     * Minimum value is 1 if included.
+     *
+     * @param page
+     * @return
+     */
+    public Discover page(int page) {
+        params.add(Param.PAGE, page);
+        return this;
+    }
+
+    /**
+     * ISO 639-1 code
+     *
+     * @param language
+     * @return
+     */
+    public Discover language(String language) {
+        params.add(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
+     * @return
+     */
+    public Discover sortBy(SortBy sortBy) {
+        params.add(Param.SORT_BY, sortBy.getPropertyString());
+        return this;
+    }
+
+    /**
+     * Toggle the inclusion of adult titles
+     *
+     * @param includeAdult
+     * @return
+     */
+    public Discover includeAdult(boolean includeAdult) {
+        params.add(Param.ADULT, includeAdult);
+        return this;
+    }
+
+    /**
+     * Toggle the inclusion of items marked as a video.
+     *
+     * Expected value is a boolean, true or false. Default is true.
+     *
+     * @param includeVideo
+     * @return
+     */
+    public Discover includeVideo(boolean includeVideo) {
+        params.add(Param.INCLUDE_VIDEO, includeVideo);
+        return this;
+    }
+
+    /**
+     * Filter the results release dates to matches that include this value.
+     *
+     * @param year
+     * @return
+     */
+    public Discover year(int year) {
+        if (checkYear(year)) {
+            params.add(Param.YEAR, year);
+        }
+        return this;
+    }
+
+    /**
+     * Filter the results so that only the primary release date year has this value
+     *
+     * @param primaryReleaseYear
+     * @return
+     */
+    public Discover primaryReleaseYear(int primaryReleaseYear) {
+        if (checkYear(primaryReleaseYear)) {
+            params.add(Param.PRIMARY_RELEASE_YEAR, primaryReleaseYear);
+        }
+        return this;
+    }
+
+    /**
+     * Only include movies that are equal to, or have a vote count higher than this value
+     *
+     * @param voteCountGte
+     * @return
+     */
+    public Discover voteCountGte(int voteCountGte) {
+        params.add(Param.VOTE_COUNT_GTE, voteCountGte);
+        return this;
+    }
+
+    /**
+     * Only include movies that are equal to, or have a vote count higher than this value
+     *
+     * @param voteCountLte
+     * @return
+     */
+    public Discover voteCountLte(int voteCountLte) {
+        params.add(Param.VOTE_COUNT_LTE, voteCountLte);
+        return this;
+    }
+
+    /**
+     * Only include movies that are equal to, or have a higher average rating than this value
+     *
+     * @param voteAverageGte
+     * @return
+     */
+    public Discover voteAverageGte(float voteAverageGte) {
+        params.add(Param.VOTE_AVERAGE_GTE, voteAverageGte);
+        return this;
+    }
+
+    /**
+     * Only include movies that are less than or equal to this value
+     *
+     * @param voteAverageLte
+     * @return
+     */
+    public Discover voteAverageLte(float voteAverageLte) {
+        params.add(Param.VOTE_AVERAGE_LTE, voteAverageLte);
+        return this;
+    }
+
+    /**
+     * The minimum release to include.
+     * <p/>
+     * Expected format is YYYY-MM-DD.
+     *
+     * @param releaseDateGte
+     * @return
+     */
+    public Discover releaseDateGte(String releaseDateGte) {
+        params.add(Param.RELEASE_DATE_GTE, releaseDateGte);
+        return this;
+    }
+
+    /**
+     * The maximum release to include.
+     * <p/>
+     * Expected format is YYYY-MM-DD.
+     *
+     * @param releaseDateLte
+     * @return
+     */
+    public Discover releaseDateLte(String releaseDateLte) {
+        params.add(Param.RELEASE_DATE_LTE, releaseDateLte);
+        return this;
+    }
+
+    /**
+     * Only include movies with certifications for a specific country.
+     * <p/>
+     * When this value is specified, 'certificationLte' is required.
+     * <p/>
+     * A ISO 3166-1 is expected
+     *
+     * @param certificationCountry
+     * @return
+     */
+    public Discover certificationCountry(String certificationCountry) {
+        params.add(Param.CERTIFICATION_COUNTRY, certificationCountry);
+        return this;
+    }
+
+    /**
+     * Only include movies with this certification and lower.
+     * <p/>
+     * Expected value is a valid certification for the specified 'certificationCountry'.
+     *
+     * @param certificationLte
+     * @return
+     */
+    public Discover certificationLte(String certificationLte) {
+        params.add(Param.CERTIFICATION_LTE, certificationLte);
+        return this;
+    }
+
+    /**
+     * Only include movies with this certification.
+     *
+     * Expected value is a valid certification for the specified 'certificationCountry'.
+     *
+     * @param certification
+     * @return
+     */
+    public Discover certification(String certification) {
+        params.add(Param.CERTIFICATION, certification);
+        return this;
+    }
+
+    /**
+     * Only include movies that have this person id added as a cast member.
+     *
+     * Expected value is an integer (the id of a person).
+     *
+     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'
+     *
+     * @param withCast
+     * @return
+     */
+    public Discover withCast(String withCast) {
+        params.add(Param.WITH_CAST, withCast);
+        return this;
+    }
+
+    /**
+     * Only include media that have these person IDs added as cast members.
+     *
+     * Use the WithBuilder to generate the list,e.g.
+     *
+     * new WithBuilder(1).and(2).and(3)
+     *
+     * @param withCast
+     * @return
+     */
+    public Discover withCast(WithBuilder withCast) {
+        return withCast(withCast.build());
+    }
+
+    /**
+     * Only include movies that have this person id added as a crew member.
+     *
+     * Expected value is an integer (the id of a person).
+     *
+     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'.
+     *
+     * @param withCrew
+     * @return
+     */
+    public Discover withCrew(String withCrew) {
+        params.add(Param.WITH_CREW, withCrew);
+        return this;
+    }
+
+    /**
+     * Only include media that have these person IDs added as crew members.
+     *
+     * Use the WithBuilder to generate the list,e.g.
+     *
+     * new WithBuilder(1).and(2).and(3)
+     *
+     * @param withCrew
+     * @return
+     */
+    public Discover withCrew(WithBuilder withCrew) {
+        return withCrew(withCrew.build());
+    }
+
+    /**
+     * Filter movies to include a specific company.
+     *
+     * Expected value is an integer (the id of a company).
+     *
+     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'
+     *
+     * @param withCompanies
+     * @return
+     */
+    public Discover withCompanies(String withCompanies) {
+        params.add(Param.WITH_COMPANIES, withCompanies);
+        return this;
+    }
+
+    /**
+     * Filter movies to include a specific company.
+     *
+     * Use the WithBuilder to generate the list,e.g.
+     *
+     * new WithBuilder(1).and(2).and(3)
+     *
+     * @param withCompanies
+     * @return
+     */
+    public Discover withCompanies(WithBuilder withCompanies) {
+        return withCompanies(withCompanies.build());
+    }
+
+    /**
+     * Only include movies with the specified genres.
+     * <p/>
+     * Expected value is an integer (the id of a genre).
+     * <p/>
+     * Multiple values can be specified.
+     * <p/>
+     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'
+     *
+     * @param withGenres
+     * @return
+     */
+    public Discover withGenres(String withGenres) {
+        params.add(Param.WITH_GENRES, withGenres);
+        return this;
+    }
+
+    /**
+     * Only include movies with the specified genres.
+     *
+     * Use the WithBuilder to generate the list,e.g.
+     *
+     * new WithBuilder(1).and(2).and(3)
+     *
+     * @param withGenres
+     * @return
+     */
+    public Discover withGenres(WithBuilder withGenres) {
+        return withGenres(withGenres.build());
+    }
+
+    /**
+     * Only include movies with the specified genres.
+     *
+     * Expected value is an integer (the id of a genre).
+     *
+     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'.
+     *
+     * @param withKeywords
+     * @return
+     */
+    public Discover withKeywords(String withKeywords) {
+        params.add(Param.WITH_KEYWORDS, withKeywords);
+        return this;
+    }
+
+    /**
+     * Only include movies with the specified genres.
+     *
+     * Use the WithBuilder to generate the list,e.g.
+     *
+     * new WithBuilder(1).and(2).and(3)
+     *
+     * @param withKeywords
+     * @return
+     */
+    public Discover withKeywords(WithBuilder withKeywords) {
+        return withKeywords(withKeywords.build());
+    }
+
+    /**
+     * Only include movies that have these person id's added as a cast or crew member.
+     *
+     * Expected value is an integer (the id or ids of a person).
+     *
+     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'.
+     *
+     * @param withPeople
+     * @return
+     */
+    public Discover withPeople(String withPeople) {
+        params.add(Param.WITH_PEOPLE, withPeople);
+        return this;
+    }
+
+    /**
+     * Only include movies that have these person id's added as a cast or crew member.
+     *
+     * Use the WithBuilder to generate the list,e.g.
+     *
+     * new WithBuilder(1).and(2).and(3)
+     *
+     * @param withPeople
+     * @return
+     */
+    public Discover withPeople(WithBuilder withPeople) {
+        return withPeople(withPeople.build());
+    }
+
+    /**
+     * Filter the air dates that match this year
+     *
+     * Expected value is a year.
+     *
+     * @param year
+     * @return
+     */
+    public Discover firstAirDateYear(int year) {
+        if (checkYear(year)) {
+            params.add(Param.FIRST_AIR_DATE_YEAR, year);
+        }
+        return this;
+    }
+
+    /**
+     * Filter the air dates to years that are greater than or equal to this year
+     *
+     * @param year
+     * @return
+     */
+    public Discover firstAirDateYearGte(int year) {
+        if (checkYear(year)) {
+            params.add(Param.FIRST_AIR_DATE_GTE, year);
+        }
+        return this;
+    }
+
+    /**
+     * Filter the air dates to years that are less than or equal to this year
+     *
+     * @param year
+     * @return
+     */
+    public Discover firstAirDateYearLte(int year) {
+        if (checkYear(year)) {
+            params.add(Param.FIRST_AIR_DATE_LTE, year);
+        }
+        return this;
+    }
+
+    /**
+     * Filter TV shows to include a specific network.
+     *
+     * Expected value is an integer (the id of a network).
+     *
+     * They can be comma separated to indicate an 'AND' query.
+     *
+     * @param withNetworks
+     * @return
+     */
+    public Discover withNetworks(String withNetworks) {
+        params.add(Param.WITH_NETWORKS, withNetworks);
+        return this;
+    }
+
+    /**
+     * Filter TV shows to include a specific network.
+     *
+     * Use the WithBuilder to generate the list,e.g.
+     *
+     * new WithBuilder(1).and(2).and(3)
+     *
+     * @param withNetworks
+     * @return
+     */
+    public Discover withNetworks(WithBuilder withNetworks) {
+        return withNetworks(withNetworks.build());
+    }
+
+    /**
+     * check the year is between the min and max
+     *
+     * @param year
+     * @return
+     */
+    private boolean checkYear(int year) {
+        return year >= YEAR_MIN && year <= YEAR_MAX;
+    }
+}

src/main/java/com/omertron/themoviedbapi/model/discover/WithBuilder.java

@@ -0,0 +1,112 @@
+/*
+ *      Copyright (c) 2004-2015 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.discover;
+
+/**
+ * Class to create a String for the "with???" parameters of the Discover method
+ *
+ * @author Stuart
+ */
+public class WithBuilder {
+
+    StringBuilder value = new StringBuilder();
+
+    /**
+     * Create the first ID in the string
+     *
+     * @param id
+     */
+    public WithBuilder(int id) {
+        value.append(id);
+    }
+
+    /**
+     * Create the first ID in the string
+     *
+     * @param id
+     */
+    public WithBuilder(String id) {
+        value.append(id);
+    }
+
+    /**
+     * Generate the string to pass to the method
+     *
+     * @return
+     */
+    public String build() {
+        return value.toString();
+    }
+
+    /**
+     * Generate the string to pass to the method
+     *
+     * @return
+     */
+    @Override
+    public String toString() {
+        return build();
+    }
+
+    /**
+     * Add an "AND ID"
+     *
+     * @param id
+     * @return
+     */
+    public WithBuilder and(int id) {
+        value.append(",").append(id);
+        return this;
+    }
+
+    /**
+     * Add an "AND ID"
+     *
+     * @param id
+     * @return
+     */
+    public WithBuilder and(String id) {
+        value.append(",").append(id);
+        return this;
+    }
+
+    /**
+     * Add an "OR ID"
+     *
+     * @param id
+     * @return
+     */
+    public WithBuilder or(int id) {
+        value.append("|").append(id);
+        return this;
+    }
+
+    /**
+     * Add an "OR ID"
+     *
+     * @param id
+     * @return
+     */
+    public WithBuilder or(String id) {
+        value.append("|").append(id);
+        return this;
+    }
+
+}

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

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2004-2015 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.keyword;
+
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.omertron.themoviedbapi.model.AbstractIdName;
+import java.io.Serializable;
+
+/**
+ * @author stuart.boston
+ */
+@JsonRootName("keyword")
+public class Keyword extends AbstractIdName implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+    // Nothing to override from the base class.
+}

src/main/java/com/omertron/themoviedbapi/model/list/ListItem.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,23 +17,24 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.list;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
 /**
- * Wrapper for the MovieDbList function
+ * Wrapper for the ListItem function
  *
  * @author stuart.boston
+ * @param <T> Type of list
  */
-public class MovieDbList extends AbstractJsonMapping {
+public class ListItem<T> extends AbstractJsonMapping implements Serializable {
+
+    private static final long serialVersionUID = 100L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("id")
     private String id;
     @JsonProperty("created_by")
@@ -43,7 +44,7 @@ public class MovieDbList extends AbstractJsonMapping {
     @JsonProperty("favorite_count")
     private int favoriteCount;
     @JsonProperty("items")
-    private List<MovieDb> items = Collections.EMPTY_LIST;
+    private List<T> items = Collections.emptyList();
     @JsonProperty("item_count")
     private int itemCount;
     @JsonProperty("iso_639_1")
@@ -57,7 +58,6 @@ public class MovieDbList extends AbstractJsonMapping {
     @JsonProperty("status_message")
     private String statusMessage;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
     public String getId() {
         return id;
     }
@@ -74,7 +74,7 @@ public class MovieDbList extends AbstractJsonMapping {
         return favoriteCount;
     }
 
-    public List<MovieDb> getItems() {
+    public List<T> getItems() {
         return items;
     }
 
@@ -101,9 +101,7 @@ public class MovieDbList extends AbstractJsonMapping {
     public String getStatusMessage() {
         return statusMessage;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
     public void setId(String id) {
         this.id = id;
     }
@@ -120,7 +118,7 @@ public class MovieDbList extends AbstractJsonMapping {
         this.favoriteCount = favoriteCount;
     }
 
-    public void setItems(List<MovieDb> items) {
+    public void setItems(List<T> items) {
         this.items = items;
     }
 
@@ -147,5 +145,4 @@ public class MovieDbList extends AbstractJsonMapping {
     public void setStatusMessage(String statusMessage) {
         this.statusMessage = statusMessage;
     }
-    //</editor-fold>
 }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.list;
 
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -26,13 +27,23 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class ListItemStatus extends AbstractJsonMapping {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 101L;
 
+    @JsonProperty("id")
+    private String id;
     @JsonProperty("status_code")
     private int statusCode;
     @JsonProperty("item_present")
     private boolean itemPresent;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public int getStatusCode() {
         return statusCode;
     }

src/main/java/com/omertron/themoviedbapi/model/list/ListStatusCode.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,11 +17,12 @@
  *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.list;
 
+import com.omertron.themoviedbapi.model.StatusCode;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class MovieDbListStatus extends StatusCode {
+public class ListStatusCode extends StatusCode {
 
     @JsonProperty("list_id")
     private String listId;

src/main/java/com/omertron/themoviedbapi/model/list/UserList.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,102 +17,99 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.list;
 
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
 
 /**
- * @author Stuart
+ * Wrapper for the MovieDbList function
+ *
+ * @author stuart.boston
  */
-public class MovieList extends AbstractJsonMapping {
+public class UserList extends AbstractJsonMapping implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
+    @JsonProperty("id")
-     * Properties
+    private String id;
-     */
     @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("list_type")
+    private String listType;
     @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 String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public int getFavoriteCount() {
+        return favoriteCount;
+    }
+
+    public void setFavoriteCount(int favoriteCount) {
+        this.favoriteCount = favoriteCount;
+    }
+
+    public int getItemCount() {
+        return itemCount;
+    }
+
     public void setItemCount(int itemCount) {
         this.itemCount = itemCount;
     }
 
+    public String getLanguage() {
+        return language;
+    }
+
     public void setLanguage(String language) {
         this.language = language;
     }
 
-    public void setName(String name) {
+    public String getListType() {
-        this.name = name;
+        return listType;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
     }
 
     public void setListType(String listType) {
         this.listType = listType;
     }
-    // </editor-fold>
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPosterPath() {
+        return posterPath;
+    }
+
+    public void setPosterPath(String posterPath) {
+        this.posterPath = posterPath;
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,28 +17,25 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.media;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.io.Serializable;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * @author Stuart
  */
 public class AlternativeTitle implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
-     * 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;
     }
@@ -46,9 +43,7 @@ public class AlternativeTitle implements Serializable {
     public String getTitle() {
         return title;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setCountry(String country) {
         this.country = country;
     }
@@ -56,31 +51,25 @@ public class AlternativeTitle implements Serializable {
     public void setTitle(String title) {
         this.title = title;
     }
-    // </editor-fold>
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
+        if (obj instanceof AlternativeTitle) {
+            final AlternativeTitle other = (AlternativeTitle) obj;
+            return new EqualsBuilder()
+                    .append(country, other.country)
+                    .append(title, other.title)
+                    .isEquals();
+        } else {
             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;
+        return new HashCodeBuilder()
-        hash = 89 * hash + (this.country != null ? this.country.hashCode() : 0);
+                .append(country)
-        hash = 89 * hash + (this.title != null ? this.title.hashCode() : 0);
+                .append(title)
-        return hash;
+                .toHashCode();
     }
 }

src/main/java/com/omertron/themoviedbapi/model/media/MediaBasic.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,126 +17,99 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.media;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.omertron.themoviedbapi.enumeration.MediaType;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import java.io.Serializable;
 
 /**
- * @author Stuart
+ * Basic media information
+ *
+ * @author stuart.boston
  */
-public class KeywordMovie extends AbstractJsonMapping {
+public class MediaBasic extends AbstractJsonMapping implements Serializable, Identification {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("id")
-    private String id;
+    private int id;
+    private MediaType mediaType;
     @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")
+    @JsonProperty("popularity")
-    private String title;
+    private float popularity;
     @JsonProperty("vote_average")
     private float voteAverage;
     @JsonProperty("vote_count")
-    private double voteCount;
+    private int voteCount;
-    @JsonProperty("adult")
-    private boolean adult;
-    @JsonProperty("popularity")
-    private float popularity;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
+    @Override
-    public static long getSerialVersionUID() {
+    public int getId() {
-        return serialVersionUID;
+        return id;
+    }
+
+    @Override
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public MediaType getMediaType() {
+        return mediaType;
+    }
+
+    @JsonSetter("media_type")
+    public void setMediaType(String mediaType) {
+        this.mediaType = MediaType.fromString(mediaType);
+    }
+
+    public void setMediaType(MediaType mediaType) {
+        this.mediaType = mediaType;
     }
 
     public String getBackdropPath() {
         return backdropPath;
     }
 
-    public String getId() {
+    public void setBackdropPath(String backdropPath) {
-        return id;
+        this.backdropPath = backdropPath;
-    }
-
-    public String getOriginalTitle() {
-        return originalTitle;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
     }
 
     public String getPosterPath() {
         return posterPath;
     }
 
-    public String getTitle() {
+    public void setPosterPath(String posterPath) {
-        return title;
+        this.posterPath = posterPath;
+    }
+
+    public float getPopularity() {
+        return popularity;
+    }
+
+    public void setPopularity(float popularity) {
+        this.popularity = popularity;
     }
 
     public float getVoteAverage() {
         return voteAverage;
     }
 
-    public double getVoteCount() {
-        return voteCount;
-    }
-
-    public boolean isAdult() {
-        return adult;
-    }
-
-    public float getPopularity() {
-        return popularity;
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public void setOriginalTitle(String originalTitle) {
-        this.originalTitle = originalTitle;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
     public void setVoteAverage(float voteAverage) {
         this.voteAverage = voteAverage;
     }
 
-    public void setVoteCount(double voteCount) {
+    public int getVoteCount() {
+        return voteCount;
+    }
+
+    public void setVoteCount(int voteCount) {
         this.voteCount = voteCount;
     }
 
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-    // </editor-fold>
 }

src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditList.java

@@ -0,0 +1,81 @@
+/*
+ *      Copyright (c) 2004-2015 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.media;
+
+import com.omertron.themoviedbapi.model.credits.MediaCreditCrew;
+import com.omertron.themoviedbapi.model.credits.MediaCreditCast;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author stuart.boston
+ */
+public class MediaCreditList extends AbstractJsonMapping implements Serializable, Identification {
+
+    private static final long serialVersionUID = 100L;
+
+    @JsonProperty("id")
+    private int id = 0;
+    @JsonProperty("cast")
+    private List<MediaCreditCast> cast = Collections.emptyList();
+    @JsonProperty("guest_stars")
+    private List<MediaCreditCast> guestStars = Collections.emptyList();
+    @JsonProperty("crew")
+    private List<MediaCreditCrew> crew = Collections.emptyList();
+
+    @Override
+    public int getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public List<MediaCreditCast> getCast() {
+        return cast;
+    }
+
+    public void setCast(List<MediaCreditCast> cast) {
+        this.cast = cast;
+    }
+
+    public List<MediaCreditCrew> getCrew() {
+        return crew;
+    }
+
+    public void setCrew(List<MediaCreditCrew> crew) {
+        this.crew = crew;
+    }
+
+    public List<MediaCreditCast> getGuestStars() {
+        return guestStars;
+    }
+
+    public void setGuestStars(List<MediaCreditCast> guestStars) {
+        this.guestStars = guestStars;
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/model/media/MediaState.java

@@ -0,0 +1,79 @@
+/*
+ *      Copyright (c) 2004-2015 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.media;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.omertron.themoviedbapi.interfaces.Identification;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
+
+/**
+ *
+ * @author Stuart.Boston
+ */
+public class MediaState extends AbstractJsonMapping implements Serializable, Identification {
+
+    private static final long serialVersionUID = 100L;
+
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("favorite")
+    private boolean favorite;
+    @JsonProperty("watchlist")
+    private boolean watchlist;
+    private float rated;
+
+    @Override
+    public int getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public boolean isFavorite() {
+        return favorite;
+    }
+
+    public void setFavorite(boolean favorite) {
+        this.favorite = favorite;
+    }
+
+    public boolean isWatchlist() {
+        return watchlist;
+    }
+
+    public void setWatchlist(boolean watchlist) {
+        this.watchlist = watchlist;
+    }
+
+    public float getRated() {
+        return rated;
+    }
+
+    @JsonSetter("rated")
+    public void setRated(RatedValue rated) {
+        this.rated = rated.getValue();
+    }
+
+}

src/main/java/com/omertron/themoviedbapi/model/media/RatedValue.java

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,30 +17,28 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.model.media;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.MovieDb;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
-import java.util.List;
+import java.io.Serializable;
 
 /**
  *
- * @author stuart.boston
+ * @author Stuart.Boston
  */
-public class WrapperMovie extends AbstractWrapperAll {
+public class RatedValue extends AbstractJsonMapping implements Serializable {
 
-    @JsonProperty("results")
+    private static final long serialVersionUID = 100L;
-    private List<MovieDb> movies;
 
-    public WrapperMovie() {
+    @JsonProperty("value")
-        super(WrapperMovie.class);
+    private float value = -1f;
+
+    public float getValue() {
+        return value;
     }
 
-    public List<MovieDb> getMovies() {
+    public void setValue(float value) {
-        return movies;
+        this.value = value;
-    }
-
-    public void setMovies(List<MovieDb> movies) {
-        this.movies = movies;
     }
 }

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

@@ -0,0 +1,102 @@
+/*
+ *      Copyright (c) 2004-2015 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.media;
+
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
+/**
+ * Trailer specific information from the "Append to Response" method
+ *
+ * @author Stuart
+ */
+public class Trailer extends AbstractJsonMapping implements Serializable {
+
+    private static final long serialVersionUID = 100L;
+
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("size")
+    private String size;
+    @JsonProperty("source")
+    private String source;
+    @JsonProperty("type")
+    private String type;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSize() {
+        return size;
+    }
+
+    public void setSize(String size) {
+        this.size = size;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Trailer) {
+            final Trailer other = (Trailer) obj;
+            return new EqualsBuilder()
+                    .append(name, other.name)
+                    .append(size, other.size)
+                    .append(source, other.source)
+                    .append(type, other.type)
+                    .isEquals();
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(name)
+                .append(size)
+                .append(source)
+                .append(type)
+                .toHashCode();
+    }
+}

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

@@ -1,5 +1,5 @@
 /*
- *      Copyright (c) 2004-2013 Stuart Boston
+ *      Copyright (c) 2004-2015 Stuart Boston
  *
  *      This file is part of TheMovieDB API.
  *
@@ -17,22 +17,23 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model.media;
 
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * @author Stuart
  */
-public class Translation extends AbstractJsonMapping {
+public class Translation extends AbstractJsonMapping implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 100L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("english_name")
     private String englishName;
     @JsonProperty("iso_639_1")
@@ -40,7 +41,6 @@ public class Translation extends AbstractJsonMapping {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getEnglishName() {
         return englishName;
     }
@@ -67,32 +67,25 @@ public class Translation extends AbstractJsonMapping {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
+        if (obj instanceof Translation) {
+            final Translation other = (Translation) obj;
+            return new EqualsBuilder()
+                    .append(name, other.name)
+                    .append(englishName, other.englishName)
+                    .append(isoCode, other.isoCode)
+                    .isEquals();
+        } else {
             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;
+        return new HashCodeBuilder()
-        hash = 29 * hash + (this.englishName != null ? this.englishName.hashCode() : 0);
+                .append(englishName)
-        hash = 29 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
+                .append(isoCode)
-        hash = 29 * hash + (this.name != null ? this.name.hashCode() : 0);
+                .append(name)
-        return hash;
+                .toHashCode();
     }
 
     @Override