move completed model classes

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

@@ -39,7 +39,7 @@ import com.omertron.themoviedbapi.methods.TmdbPeople;
 import com.omertron.themoviedbapi.methods.TmdbReviews;
 import com.omertron.themoviedbapi.methods.TmdbSearch;
 import com.omertron.themoviedbapi.methods.TmdbTV;
-import com.omertron.themoviedbapi.model.Account;
+import com.omertron.themoviedbapi.model2.account.Account;
 import com.omertron.themoviedbapi.model.AlternativeTitle;
 import com.omertron.themoviedbapi.model.Artwork;
 import com.omertron.themoviedbapi.model.Certification;
@@ -47,10 +47,10 @@ import com.omertron.themoviedbapi.model.change.ChangedMedia;
 import com.omertron.themoviedbapi.model.Collection;
 import com.omertron.themoviedbapi.model.CollectionInfo;
 import com.omertron.themoviedbapi.model.Company;
-import com.omertron.themoviedbapi.model.Configuration;
+import com.omertron.themoviedbapi.model2.Configuration;
 import com.omertron.themoviedbapi.model.discover.Discover;
 import com.omertron.themoviedbapi.model.Genre;
-import com.omertron.themoviedbapi.model.JobDepartment;
+import com.omertron.themoviedbapi.model2.JobDepartment;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
 import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
 import com.omertron.themoviedbapi.model.MovieDb;
@@ -60,18 +60,18 @@ import com.omertron.themoviedbapi.model.person.Person;
 import com.omertron.themoviedbapi.model.person.PersonCredit;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
 import com.omertron.themoviedbapi.model.Reviews;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.model.TBD_ExternalSource;
 import com.omertron.themoviedbapi.model.TBD_FindResults;
 import com.omertron.themoviedbapi.model.TBD_Network;
 import com.omertron.themoviedbapi.model.TBD_PersonCredits;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.model.Video;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
-import com.omertron.themoviedbapi.model.list.TVFavorite;
+import com.omertron.themoviedbapi.model2.tv.TVFavorite;
-import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model2.list.UserList;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import com.omertron.themoviedbapi.results.TmdbResultsMap;
 import com.omertron.themoviedbapi.tools.HttpTools;

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

@@ -22,9 +22,9 @@ 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.list.MovieFavorite;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
-import com.omertron.themoviedbapi.model.list.TVFavorite;
+import com.omertron.themoviedbapi.model2.tv.TVFavorite;
-import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model2.list.UserList;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
 import java.io.IOException;

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

@@ -21,11 +21,11 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.MovieDbException;
 import com.omertron.themoviedbapi.enumeration.MediaType;
-import com.omertron.themoviedbapi.model.Account;
+import com.omertron.themoviedbapi.model2.account.Account;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
-import com.omertron.themoviedbapi.model.list.TVFavorite;
+import com.omertron.themoviedbapi.model2.tv.TVFavorite;
-import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model2.list.UserList;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;

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

@@ -20,8 +20,8 @@
 package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.MovieDbException;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;

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

@@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.MovieDbException;
 import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
-import com.omertron.themoviedbapi.model.Configuration;
+import com.omertron.themoviedbapi.model2.Configuration;
-import com.omertron.themoviedbapi.model.JobDepartment;
+import com.omertron.themoviedbapi.model2.JobDepartment;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;

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

@@ -23,7 +23,7 @@ import com.omertron.themoviedbapi.MovieDbException;
 import com.omertron.themoviedbapi.model.ListItemStatus;
 import com.omertron.themoviedbapi.model.MovieDbList;
 import com.omertron.themoviedbapi.model.MovieDbListStatus;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;

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

@@ -25,7 +25,7 @@ import com.omertron.themoviedbapi.model.Artwork;
 import com.omertron.themoviedbapi.model.MovieDb;
 import com.omertron.themoviedbapi.model.MovieList;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.model.Video;
 import com.omertron.themoviedbapi.model.keyword.Keyword;

src/main/java/com/omertron/themoviedbapi/methods/_Method_List.txt

@@ -1,4 +1,4 @@
-Account
+Account (done)
 /account Get the basic information for an account. You will need to have a valid session id.
 /account/{id}/lists Get the lists that you have created and marked as a favorite.
 /account/{id}/favorite/movies Get the list of favorite movies for an account.
@@ -10,7 +10,7 @@ Account
 /account/{id}/watchlist/tv Get the list of TV series on an accounts watchlist
 /account/{id}/watchlist Add or remove a movie to an accounts watch list
 
-Authentication
+Authentication (done)
 /authentication/token/new This method is used to generate a valid request token for user based authentication
 /authentication/token/validate_with_login Once you have a valid request token you can use this method to authenticate a user with a TMDb username and password.
 /authentication/session/new 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.
@@ -51,7 +51,7 @@ Genres
 Guest Sessions
 /guest_session/{guest_session_id}/rated_movies Get a list of rated movies for a specific guest session id.
 
-Jobs
+Jobs (Done)
 /job/list Get a list of valid jobs.
 
 Keyword

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.omertron.themoviedbapi.enumeration.ArtworkType;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import org.apache.commons.lang3.StringUtils;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import org.apache.commons.lang3.builder.EqualsBuilder;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
 import com.omertron.themoviedbapi.model.person.PersonCast;
 import com.omertron.themoviedbapi.model.person.PersonCrew;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Collections;
 import java.util.List;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class MovieDbListStatus extends StatusCode {

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import org.apache.commons.lang3.builder.EqualsBuilder;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

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

@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

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

@@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.model.change;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.change;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 
 public class ChangedMedia extends AbstractJsonMapping {
 

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.change;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 
 public class ChangedMovie extends AbstractJsonMapping {
 

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.keyword;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 
 /**
  * @author Stuart

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.person;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.person;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.person;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.person;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

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

@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model2;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import java.io.Serializable;

src/main/java/com/omertron/themoviedbapi/model2/Configuration.java

@@ -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.model2;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.MovieDbException;
 import java.net.MalformedURLException;

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

@@ -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.model2;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;

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

@@ -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.model2;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**

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

@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model2.account;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Account extends AbstractJsonMapping {

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

@@ -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.model2.authentication;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class TokenAuthorisation extends AbstractJsonMapping {

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

@@ -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.model2.authentication;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class TokenSession extends AbstractJsonMapping {

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

@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.list;
+package com.omertron.themoviedbapi.model2.list;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.omertron.themoviedbapi.model.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/omertron/themoviedbapi/model2/movie/MovieFavorite.java

@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.list;
+package com.omertron.themoviedbapi.model2.movie;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.omertron.themoviedbapi.model.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/omertron/themoviedbapi/model2/tv/TVFavorite.java

@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.list;
+package com.omertron.themoviedbapi.model2.tv;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.omertron.themoviedbapi.model.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;

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

@@ -19,7 +19,7 @@
  */
 package com.omertron.themoviedbapi.wrapper;
 
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.Configuration;
+import com.omertron.themoviedbapi.model2.Configuration;
 import java.util.Collections;
 import java.util.List;
 

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

@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.JobDepartment;
+import com.omertron.themoviedbapi.model2.JobDepartment;
 import java.util.List;
 
 /**

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

@@ -21,9 +21,9 @@ package com.omertron.themoviedbapi;
 
 import com.omertron.themoviedbapi.methods.TmdbAccount;
 import com.omertron.themoviedbapi.methods.TmdbAuthentication;
-import com.omertron.themoviedbapi.model.Account;
+import com.omertron.themoviedbapi.model2.account.Account;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import java.io.File;
 import java.io.IOException;

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

@@ -27,7 +27,7 @@ import com.omertron.themoviedbapi.model.CollectionInfo;
 import com.omertron.themoviedbapi.model.Company;
 import com.omertron.themoviedbapi.model.discover.Discover;
 import com.omertron.themoviedbapi.model.Genre;
-import com.omertron.themoviedbapi.model.JobDepartment;
+import com.omertron.themoviedbapi.model2.JobDepartment;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
 import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
 import com.omertron.themoviedbapi.model.MovieDb;
@@ -37,9 +37,9 @@ import com.omertron.themoviedbapi.model.person.Person;
 import com.omertron.themoviedbapi.model.person.PersonCredit;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
 import com.omertron.themoviedbapi.model.Reviews;
-import com.omertron.themoviedbapi.model.Configuration;
+import com.omertron.themoviedbapi.model2.Configuration;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.model.Video;
 import com.omertron.themoviedbapi.results.TmdbResultsList;

src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java

@@ -22,11 +22,11 @@ package com.omertron.themoviedbapi.methods;
 import com.omertron.themoviedbapi.AbstractTests;
 import com.omertron.themoviedbapi.MovieDbException;
 import com.omertron.themoviedbapi.enumeration.MediaType;
-import com.omertron.themoviedbapi.model.Account;
+import com.omertron.themoviedbapi.model2.account.Account;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
-import com.omertron.themoviedbapi.model.list.TVFavorite;
+import com.omertron.themoviedbapi.model2.tv.TVFavorite;
-import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model2.list.UserList;
 import java.util.List;
 import org.junit.After;
 import org.junit.AfterClass;

src/test/java/com/omertron/themoviedbapi/methods/TmdbAuthenticationTest.java

@@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.AbstractTests;
 import com.omertron.themoviedbapi.MovieDbException;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java

@@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.AbstractTests;
 import com.omertron.themoviedbapi.MovieDbException;
-import com.omertron.themoviedbapi.model.Configuration;
+import com.omertron.themoviedbapi.model2.Configuration;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.AfterClass;

src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java

@@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.methods;
 import com.omertron.themoviedbapi.AbstractTests;
 import com.omertron.themoviedbapi.MovieDbException;
 import com.omertron.themoviedbapi.model.MovieDbList;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import org.junit.After;
 import org.junit.AfterClass;

src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java

@@ -29,7 +29,7 @@ import com.omertron.themoviedbapi.model.MovieList;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.model.Video;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import java.util.List;
 import java.util.Random;