From 590852c5aca7679560ce48a54db28ea143252462 Mon Sep 17 00:00:00 2001 From: Stuart Boston Date: Wed, 4 Mar 2015 12:41:59 +0000 Subject: [PATCH] rename new model package --- .../com/omertron/themoviedbapi/Compare.java | 2 +- .../omertron/themoviedbapi/TheMovieDbApi.java | 72 +++++++++---------- .../themoviedbapi/methods/AbstractMethod.java | 20 +++--- .../themoviedbapi/methods/TmdbAccount.java | 10 +-- .../methods/TmdbAuthentication.java | 4 +- .../methods/TmdbCertifications.java | 2 +- .../themoviedbapi/methods/TmdbChanges.java | 2 +- .../methods/TmdbCollections.java | 4 +- .../themoviedbapi/methods/TmdbCompanies.java | 4 +- .../methods/TmdbConfiguration.java | 4 +- .../themoviedbapi/methods/TmdbCredits.java | 2 +- .../themoviedbapi/methods/TmdbDiscover.java | 6 +- .../themoviedbapi/methods/TmdbFind.java | 2 +- .../themoviedbapi/methods/TmdbGenres.java | 4 +- .../themoviedbapi/methods/TmdbKeywords.java | 4 +- .../themoviedbapi/methods/TmdbLists.java | 10 +-- .../themoviedbapi/methods/TmdbMovies.java | 24 +++---- .../themoviedbapi/methods/TmdbNetworks.java | 2 +- .../themoviedbapi/methods/TmdbPeople.java | 12 ++-- .../themoviedbapi/methods/TmdbReviews.java | 2 +- .../themoviedbapi/methods/TmdbSearch.java | 16 ++--- .../{model2 => model}/AbstractIdName.java | 4 +- .../AbstractJsonMapping.java | 2 +- .../{model2 => model}/Certification.java | 2 +- .../{model2 => model}/FindResults.java | 12 ++-- .../{model2 => model}/Genre.java | 2 +- .../{model2 => model}/Language.java | 4 +- .../{model2 => model}/StatusCode.java | 2 +- .../{model2 => model}/account/Account.java | 4 +- .../{model2 => model}/artwork/Artwork.java | 4 +- .../artwork/ArtworkMedia.java | 10 +-- .../authentication/TokenAuthorisation.java | 4 +- .../authentication/TokenSession.java | 4 +- .../change/ChangeKeyItem.java | 4 +- .../change/ChangeListItem.java | 4 +- .../{model2 => model}/change/ChangedItem.java | 4 +- .../collection/Collection.java | 4 +- .../collection/CollectionInfo.java | 4 +- .../{model2 => model}/company/Company.java | 4 +- .../config/Configuration.java | 4 +- .../config/JobDepartment.java | 4 +- .../{model2 => model}/discover/Discover.java | 2 +- .../discover/WithBuilder.java | 2 +- .../{model2 => model}/keyword/Keyword.java | 4 +- .../{model2 => model}/list/ListItem.java | 4 +- .../list/ListItemStatus.java | 4 +- .../list/ListStatusCode.java | 4 +- .../{model2 => model}/list/UserList.java | 4 +- .../{model2 => model}/media/MediaBasic.java | 4 +- .../{model2 => model}/media/MediaCredit.java | 4 +- .../media/MediaCreditCast.java | 2 +- .../media/MediaCreditCrew.java | 2 +- .../media/MediaCreditList.java | 4 +- .../{model2 => model}/media/MediaState.java | 4 +- .../{model2 => model}/media/RatedValue.java | 4 +- .../movie/AlternativeTitle.java | 2 +- .../{model2 => model}/movie/MovieBasic.java | 4 +- .../{model2 => model}/movie/MovieDb.java | 24 +++---- .../movie/ProductionCompany.java | 4 +- .../movie/ProductionCountry.java | 4 +- .../{model2 => model}/movie/ReleaseInfo.java | 4 +- .../{model2 => model}/movie/Trailer.java | 4 +- .../{model2 => model}/movie/Translation.java | 4 +- .../{model2 => model}/movie/Video.java | 4 +- .../{model2 => model}/network/Network.java | 4 +- .../{model2 => model}/person/CreditBasic.java | 4 +- .../{model2 => model}/person/CreditInfo.java | 6 +- .../person/CreditMovieBasic.java | 2 +- .../person/CreditTVBasic.java | 2 +- .../{model2 => model}/person/ExternalID.java | 4 +- .../{model2 => model}/person/Person.java | 2 +- .../{model2 => model}/person/PersonBasic.java | 4 +- .../person/PersonCredits.java | 4 +- .../{model2 => model}/person/PersonFind.java | 10 +-- .../{model2 => model}/review/Review.java | 4 +- .../{model2 => model}/tv/TVBasic.java | 4 +- .../{model2 => model}/tv/TVCredit.java | 4 +- .../{model2 => model}/tv/TVEpisodeBasic.java | 4 +- .../{model2 => model}/tv/TVSeasonBasic.java | 4 +- .../wrapper/AbstractWrapper.java | 2 +- .../wrapper/WrapperAlternativeTitles.java | 2 +- .../themoviedbapi/wrapper/WrapperChanges.java | 2 +- .../wrapper/WrapperCollection.java | 2 +- .../themoviedbapi/wrapper/WrapperCompany.java | 2 +- .../wrapper/WrapperCompanyMovies.java | 2 +- .../themoviedbapi/wrapper/WrapperConfig.java | 2 +- .../themoviedbapi/wrapper/WrapperGenres.java | 2 +- .../themoviedbapi/wrapper/WrapperImages.java | 2 +- .../themoviedbapi/wrapper/WrapperJobList.java | 2 +- .../wrapper/WrapperKeywords.java | 2 +- .../themoviedbapi/wrapper/WrapperMovie.java | 2 +- .../wrapper/WrapperMovieDbList.java | 2 +- .../wrapper/WrapperMovieKeywords.java | 2 +- .../wrapper/WrapperMultiSearch.java | 8 +-- .../wrapper/WrapperReleaseInfo.java | 2 +- .../themoviedbapi/wrapper/WrapperReviews.java | 2 +- .../wrapper/WrapperTranslations.java | 2 +- .../wrapper/WrapperUserList.java | 2 +- .../themoviedbapi/wrapper/WrapperVideos.java | 4 +- .../omertron/themoviedbapi/AbstractTests.java | 6 +- .../omertron/themoviedbapi/CompareTest.java | 2 +- .../methods/TmdbAccountTest.java | 12 ++-- .../methods/TmdbAuthenticationTest.java | 4 +- .../methods/TmdbCertificationsTest.java | 2 +- .../methods/TmdbChangesTest.java | 2 +- .../methods/TmdbCollectionsTest.java | 4 +- .../methods/TmdbCompaniesTest.java | 4 +- .../methods/TmdbConfigurationTest.java | 4 +- .../methods/TmdbCreditsTest.java | 2 +- .../methods/TmdbDiscoverTest.java | 6 +- .../themoviedbapi/methods/TmdbFindTest.java | 8 +-- .../themoviedbapi/methods/TmdbGenresTest.java | 4 +- .../methods/TmdbKeywordsTest.java | 4 +- .../themoviedbapi/methods/TmdbListsTest.java | 4 +- .../themoviedbapi/methods/TmdbMoviesTest.java | 30 ++++---- .../methods/TmdbNetworksTest.java | 2 +- .../themoviedbapi/methods/TmdbPeopleTest.java | 16 ++--- .../methods/TmdbReviewsTest.java | 2 +- .../themoviedbapi/methods/TmdbSearchTest.java | 16 ++--- 119 files changed, 320 insertions(+), 320 deletions(-) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/AbstractIdName.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/AbstractJsonMapping.java (97%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/Certification.java (97%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/FindResults.java (88%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/Genre.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/Language.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/StatusCode.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/account/Account.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/artwork/Artwork.java (97%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/artwork/ArtworkMedia.java (90%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/authentication/TokenAuthorisation.java (93%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/authentication/TokenSession.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/change/ChangeKeyItem.java (92%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/change/ChangeListItem.java (92%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/change/ChangedItem.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/collection/Collection.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/collection/CollectionInfo.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/company/Company.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/config/Configuration.java (98%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/config/JobDepartment.java (92%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/discover/Discover.java (99%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/discover/WithBuilder.java (97%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/keyword/Keyword.java (90%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/list/ListItem.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/list/ListItemStatus.java (92%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/list/ListStatusCode.java (91%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/list/UserList.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/media/MediaBasic.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/media/MediaCredit.java (93%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/media/MediaCreditCast.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/media/MediaCreditCrew.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/media/MediaCreditList.java (93%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/media/MediaState.java (94%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/media/RatedValue.java (91%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/AlternativeTitle.java (97%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/MovieBasic.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/MovieDb.java (94%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/ProductionCompany.java (90%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/ProductionCountry.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/ReleaseInfo.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/Trailer.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/Translation.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/movie/Video.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/network/Network.java (92%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/CreditBasic.java (96%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/CreditInfo.java (93%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/CreditMovieBasic.java (97%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/CreditTVBasic.java (97%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/ExternalID.java (94%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/Person.java (98%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/PersonBasic.java (89%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/PersonCredits.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/person/PersonFind.java (89%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/review/Review.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/tv/TVBasic.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/tv/TVCredit.java (94%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/tv/TVEpisodeBasic.java (95%) rename src/main/java/com/omertron/themoviedbapi/{model2 => model}/tv/TVSeasonBasic.java (93%) diff --git a/src/main/java/com/omertron/themoviedbapi/Compare.java b/src/main/java/com/omertron/themoviedbapi/Compare.java index 9116751bc..8719734dc 100644 --- a/src/main/java/com/omertron/themoviedbapi/Compare.java +++ b/src/main/java/com/omertron/themoviedbapi/Compare.java @@ -19,7 +19,7 @@ */ package com.omertron.themoviedbapi; -import com.omertron.themoviedbapi.model2.movie.MovieDb; +import com.omertron.themoviedbapi.model.movie.MovieDb; import org.apache.commons.lang3.StringUtils; /** diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java index f968e804b..12bfc21f1 100644 --- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java +++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java @@ -42,42 +42,42 @@ 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.model2.Certification; -import com.omertron.themoviedbapi.model2.FindResults; -import com.omertron.themoviedbapi.model2.Genre; -import com.omertron.themoviedbapi.model2.StatusCode; -import com.omertron.themoviedbapi.model2.account.Account; -import com.omertron.themoviedbapi.model2.artwork.Artwork; -import com.omertron.themoviedbapi.model2.artwork.ArtworkMedia; -import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation; -import com.omertron.themoviedbapi.model2.authentication.TokenSession; -import com.omertron.themoviedbapi.model2.change.ChangeListItem; -import com.omertron.themoviedbapi.model2.collection.Collection; -import com.omertron.themoviedbapi.model2.collection.CollectionInfo; -import com.omertron.themoviedbapi.model2.company.Company; -import com.omertron.themoviedbapi.model2.config.Configuration; -import com.omertron.themoviedbapi.model2.config.JobDepartment; -import com.omertron.themoviedbapi.model2.discover.Discover; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.list.ListItem; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.media.MediaBasic; -import com.omertron.themoviedbapi.model2.media.MediaCreditList; -import com.omertron.themoviedbapi.model2.media.MediaState; -import com.omertron.themoviedbapi.model2.movie.AlternativeTitle; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.movie.MovieDb; -import com.omertron.themoviedbapi.model2.movie.ReleaseInfo; -import com.omertron.themoviedbapi.model2.movie.Translation; -import com.omertron.themoviedbapi.model2.movie.Video; -import com.omertron.themoviedbapi.model2.network.Network; -import com.omertron.themoviedbapi.model2.person.CreditInfo; -import com.omertron.themoviedbapi.model2.person.ExternalID; -import com.omertron.themoviedbapi.model2.person.Person; -import com.omertron.themoviedbapi.model2.person.PersonCredits; -import com.omertron.themoviedbapi.model2.person.PersonFind; -import com.omertron.themoviedbapi.model2.review.Review; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +import com.omertron.themoviedbapi.model.Certification; +import com.omertron.themoviedbapi.model.FindResults; +import com.omertron.themoviedbapi.model.Genre; +import com.omertron.themoviedbapi.model.StatusCode; +import com.omertron.themoviedbapi.model.account.Account; +import com.omertron.themoviedbapi.model.artwork.Artwork; +import com.omertron.themoviedbapi.model.artwork.ArtworkMedia; +import com.omertron.themoviedbapi.model.authentication.TokenAuthorisation; +import com.omertron.themoviedbapi.model.authentication.TokenSession; +import com.omertron.themoviedbapi.model.change.ChangeListItem; +import com.omertron.themoviedbapi.model.collection.Collection; +import com.omertron.themoviedbapi.model.collection.CollectionInfo; +import com.omertron.themoviedbapi.model.company.Company; +import com.omertron.themoviedbapi.model.config.Configuration; +import com.omertron.themoviedbapi.model.config.JobDepartment; +import com.omertron.themoviedbapi.model.discover.Discover; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.list.ListItem; +import com.omertron.themoviedbapi.model.list.UserList; +import com.omertron.themoviedbapi.model.media.MediaBasic; +import com.omertron.themoviedbapi.model.media.MediaCreditList; +import com.omertron.themoviedbapi.model.media.MediaState; +import com.omertron.themoviedbapi.model.movie.AlternativeTitle; +import com.omertron.themoviedbapi.model.movie.MovieBasic; +import com.omertron.themoviedbapi.model.movie.MovieDb; +import com.omertron.themoviedbapi.model.movie.ReleaseInfo; +import com.omertron.themoviedbapi.model.movie.Translation; +import com.omertron.themoviedbapi.model.movie.Video; +import com.omertron.themoviedbapi.model.network.Network; +import com.omertron.themoviedbapi.model.person.CreditInfo; +import com.omertron.themoviedbapi.model.person.ExternalID; +import com.omertron.themoviedbapi.model.person.Person; +import com.omertron.themoviedbapi.model.person.PersonCredits; +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.results.TmdbResultsList; import com.omertron.themoviedbapi.results.TmdbResultsMap; import com.omertron.themoviedbapi.tools.HttpTools; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java b/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java index d187f58ca..f610cd095 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java @@ -22,16 +22,16 @@ 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.model2.collection.Collection; -import com.omertron.themoviedbapi.model2.company.Company; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.movie.MovieDb; -import com.omertron.themoviedbapi.model2.person.Person; -import com.omertron.themoviedbapi.model2.person.PersonFind; -import com.omertron.themoviedbapi.model2.review.Review; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +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.movie.MovieBasic; +import com.omertron.themoviedbapi.model.movie.MovieDb; +import com.omertron.themoviedbapi.model.person.Person; +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.tools.HttpTools; import com.omertron.themoviedbapi.wrapper.WrapperGenericList; import java.io.IOException; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java index 9349972d8..b24321479 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java @@ -22,11 +22,11 @@ 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.model2.StatusCode; -import com.omertron.themoviedbapi.model2.account.Account; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +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.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; import com.omertron.themoviedbapi.tools.MethodBase; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAuthentication.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAuthentication.java index b1dcf3120..247cc7dec 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAuthentication.java +++ b/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.model2.authentication.TokenAuthorisation; -import com.omertron.themoviedbapi.model2.authentication.TokenSession; +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; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java index e5bb9cc21..addd2a02e 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCertifications.java @@ -25,7 +25,7 @@ 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.model2.Certification; +import com.omertron.themoviedbapi.model.Certification; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.MethodBase; import com.omertron.themoviedbapi.tools.MethodSub; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java index dcc7f7bf1..a389b764e 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods; import com.fasterxml.jackson.core.type.TypeReference; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.change.ChangeListItem; +import com.omertron.themoviedbapi.model.change.ChangeListItem; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; import com.omertron.themoviedbapi.tools.MethodBase; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java index 064ae5699..501961607 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java @@ -20,9 +20,9 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.artwork.Artwork; +import com.omertron.themoviedbapi.model.artwork.Artwork; import com.omertron.themoviedbapi.enumeration.ArtworkType; -import com.omertron.themoviedbapi.model2.collection.CollectionInfo; +import com.omertron.themoviedbapi.model.collection.CollectionInfo; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java index ac82e8e7d..52ce18075 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java @@ -20,8 +20,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.company.Company; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; +import com.omertron.themoviedbapi.model.company.Company; +import com.omertron.themoviedbapi.model.movie.MovieBasic; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; import com.omertron.themoviedbapi.tools.MethodBase; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java index 7ea039da5..ac187acf8 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java @@ -22,8 +22,8 @@ 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.model2.config.Configuration; -import com.omertron.themoviedbapi.model2.config.JobDepartment; +import com.omertron.themoviedbapi.model.config.Configuration; +import com.omertron.themoviedbapi.model.config.JobDepartment; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java index f37ea21ae..e0c6ac6c3 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCredits.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.person.CreditInfo; +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; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java index d7bea8965..625f5db07 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java @@ -20,9 +20,9 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.discover.Discover; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +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.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; import com.omertron.themoviedbapi.tools.MethodBase; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbFind.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbFind.java index c7ea95a78..0e9198875 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbFind.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbFind.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.enumeration.ExternalSource; -import com.omertron.themoviedbapi.model2.FindResults; +import com.omertron.themoviedbapi.model.FindResults; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; import com.omertron.themoviedbapi.tools.MethodBase; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java index 3f817f763..ebc35917a 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java @@ -20,8 +20,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.Genre; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; +import com.omertron.themoviedbapi.model.Genre; +import com.omertron.themoviedbapi.model.movie.MovieBasic; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java index 7de244d86..2aa30fdfd 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java @@ -20,8 +20,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.movie.MovieBasic; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java index 12cbde45e..3b05c1560 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java @@ -21,11 +21,11 @@ package com.omertron.themoviedbapi.methods; import com.fasterxml.jackson.core.type.TypeReference; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.list.ListStatusCode; -import com.omertron.themoviedbapi.model2.StatusCode; -import com.omertron.themoviedbapi.model2.list.ListItem; -import com.omertron.themoviedbapi.model2.list.ListItemStatus; -import com.omertron.themoviedbapi.model2.movie.MovieDb; +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.MovieDb; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; import com.omertron.themoviedbapi.tools.MethodBase; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java index 10912ab0e..9bd9880f7 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java @@ -21,18 +21,18 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER; -import com.omertron.themoviedbapi.model2.StatusCode; -import com.omertron.themoviedbapi.model2.artwork.Artwork; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.media.MediaCreditList; -import com.omertron.themoviedbapi.model2.media.MediaState; -import com.omertron.themoviedbapi.model2.movie.AlternativeTitle; -import com.omertron.themoviedbapi.model2.movie.MovieDb; -import com.omertron.themoviedbapi.model2.movie.ReleaseInfo; -import com.omertron.themoviedbapi.model2.movie.Translation; -import com.omertron.themoviedbapi.model2.movie.Video; -import com.omertron.themoviedbapi.model2.review.Review; +import com.omertron.themoviedbapi.model.StatusCode; +import com.omertron.themoviedbapi.model.artwork.Artwork; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.list.UserList; +import com.omertron.themoviedbapi.model.media.MediaCreditList; +import com.omertron.themoviedbapi.model.media.MediaState; +import com.omertron.themoviedbapi.model.movie.AlternativeTitle; +import com.omertron.themoviedbapi.model.movie.MovieDb; +import com.omertron.themoviedbapi.model.movie.ReleaseInfo; +import com.omertron.themoviedbapi.model.movie.Translation; +import com.omertron.themoviedbapi.model.movie.Video; +import com.omertron.themoviedbapi.model.review.Review; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbNetworks.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbNetworks.java index 5d9be6e78..061380459 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbNetworks.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbNetworks.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.network.Network; +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; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java index 55543f464..f3ff0b19e 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java @@ -22,12 +22,12 @@ package com.omertron.themoviedbapi.methods; import com.fasterxml.jackson.core.type.TypeReference; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.enumeration.ArtworkType; -import com.omertron.themoviedbapi.model2.artwork.Artwork; -import com.omertron.themoviedbapi.model2.artwork.ArtworkMedia; -import com.omertron.themoviedbapi.model2.person.ExternalID; -import com.omertron.themoviedbapi.model2.person.Person; -import com.omertron.themoviedbapi.model2.person.PersonCredits; -import com.omertron.themoviedbapi.model2.person.PersonFind; +import com.omertron.themoviedbapi.model.artwork.Artwork; +import com.omertron.themoviedbapi.model.artwork.ArtworkMedia; +import com.omertron.themoviedbapi.model.person.ExternalID; +import com.omertron.themoviedbapi.model.person.Person; +import com.omertron.themoviedbapi.model.person.PersonCredits; +import com.omertron.themoviedbapi.model.person.PersonFind; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbReviews.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbReviews.java index d47bcaab9..2d2455cae 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbReviews.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbReviews.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER; -import com.omertron.themoviedbapi.model2.review.Review; +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; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java index 42a00798f..91423093e 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java @@ -22,14 +22,14 @@ 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.model2.movie.MovieDb; -import com.omertron.themoviedbapi.model2.media.MediaBasic; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.collection.Collection; -import com.omertron.themoviedbapi.model2.company.Company; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.person.PersonFind; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +import com.omertron.themoviedbapi.model.movie.MovieDb; +import com.omertron.themoviedbapi.model.media.MediaBasic; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.collection.Collection; +import com.omertron.themoviedbapi.model.company.Company; +import com.omertron.themoviedbapi.model.list.UserList; +import com.omertron.themoviedbapi.model.person.PersonFind; +import com.omertron.themoviedbapi.model.tv.TVBasic; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.HttpTools; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/AbstractIdName.java b/src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/AbstractIdName.java rename to src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java index dc1e3de87..72225b971 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/AbstractIdName.java +++ b/src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not;private see . * */ -package com.omertron.themoviedbapi.model2; +package com.omertron.themoviedbapi.model; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/AbstractJsonMapping.java b/src/main/java/com/omertron/themoviedbapi/model/AbstractJsonMapping.java similarity index 97% rename from src/main/java/com/omertron/themoviedbapi/model2/AbstractJsonMapping.java rename to src/main/java/com/omertron/themoviedbapi/model/AbstractJsonMapping.java index 2fd9f2ed2..ec03209c9 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/AbstractJsonMapping.java +++ b/src/main/java/com/omertron/themoviedbapi/model/AbstractJsonMapping.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not;private see . * */ -package com.omertron.themoviedbapi.model2; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import java.io.Serializable; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/Certification.java b/src/main/java/com/omertron/themoviedbapi/model/Certification.java similarity index 97% rename from src/main/java/com/omertron/themoviedbapi/model2/Certification.java rename to src/main/java/com/omertron/themoviedbapi/model/Certification.java index 806fd971a..c705bb054 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/Certification.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Certification.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not;private see . * */ -package com.omertron.themoviedbapi.model2; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/FindResults.java b/src/main/java/com/omertron/themoviedbapi/model/FindResults.java similarity index 88% rename from src/main/java/com/omertron/themoviedbapi/model2/FindResults.java rename to src/main/java/com/omertron/themoviedbapi/model/FindResults.java index 88c1b3027..60c57be48 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/FindResults.java +++ b/src/main/java/com/omertron/themoviedbapi/model/FindResults.java @@ -17,14 +17,14 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.person.PersonFind; -import com.omertron.themoviedbapi.model2.tv.TVBasic; -import com.omertron.themoviedbapi.model2.tv.TVEpisodeBasic; -import com.omertron.themoviedbapi.model2.tv.TVSeasonBasic; +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.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/Genre.java b/src/main/java/com/omertron/themoviedbapi/model/Genre.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/Genre.java rename to src/main/java/com/omertron/themoviedbapi/model/Genre.java index 367ee89bb..ee6e068af 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/Genre.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Genre.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonRootName; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/Language.java b/src/main/java/com/omertron/themoviedbapi/model/Language.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/Language.java rename to src/main/java/com/omertron/themoviedbapi/model/Language.java index a37b5384d..b89fcb01a 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/Language.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Language.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2; +package com.omertron.themoviedbapi.model; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/StatusCode.java b/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/StatusCode.java rename to src/main/java/com/omertron/themoviedbapi/model/StatusCode.java index 0257610ad..28b02d1c4 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/StatusCode.java +++ b/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2; +package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/account/Account.java b/src/main/java/com/omertron/themoviedbapi/model/account/Account.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/account/Account.java rename to src/main/java/com/omertron/themoviedbapi/model/account/Account.java index f966cc0f8..372a3b256 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/account/Account.java +++ b/src/main/java/com/omertron/themoviedbapi/model/account/Account.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not;private see . * */ -package com.omertron.themoviedbapi.model2.account; +package com.omertron.themoviedbapi.model.account; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; public class Account extends AbstractJsonMapping { diff --git a/src/main/java/com/omertron/themoviedbapi/model2/artwork/Artwork.java b/src/main/java/com/omertron/themoviedbapi/model/artwork/Artwork.java similarity index 97% rename from src/main/java/com/omertron/themoviedbapi/model2/artwork/Artwork.java rename to src/main/java/com/omertron/themoviedbapi/model/artwork/Artwork.java index 19bb4f91b..5f771bd97 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/artwork/Artwork.java +++ b/src/main/java/com/omertron/themoviedbapi/model/artwork/Artwork.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.artwork; +package com.omertron.themoviedbapi.model.artwork; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.omertron.themoviedbapi.enumeration.ArtworkType; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/artwork/ArtworkMedia.java b/src/main/java/com/omertron/themoviedbapi/model/artwork/ArtworkMedia.java similarity index 90% rename from src/main/java/com/omertron/themoviedbapi/model2/artwork/ArtworkMedia.java rename to src/main/java/com/omertron/themoviedbapi/model/artwork/ArtworkMedia.java index 48e96b0f2..e1a18db64 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/artwork/ArtworkMedia.java +++ b/src/main/java/com/omertron/themoviedbapi/model/artwork/ArtworkMedia.java @@ -17,17 +17,17 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.artwork; +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.model2.media.MediaBasic; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.tv.TVBasic; -import com.omertron.themoviedbapi.model2.tv.TVEpisodeBasic; +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 org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenAuthorisation.java b/src/main/java/com/omertron/themoviedbapi/model/authentication/TokenAuthorisation.java similarity index 93% rename from src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenAuthorisation.java rename to src/main/java/com/omertron/themoviedbapi/model/authentication/TokenAuthorisation.java index ecf36e60a..4db66adf1 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenAuthorisation.java +++ b/src/main/java/com/omertron/themoviedbapi/model/authentication/TokenAuthorisation.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.authentication; +package com.omertron.themoviedbapi.model.authentication; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; public class TokenAuthorisation extends AbstractJsonMapping { diff --git a/src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenSession.java b/src/main/java/com/omertron/themoviedbapi/model/authentication/TokenSession.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenSession.java rename to src/main/java/com/omertron/themoviedbapi/model/authentication/TokenSession.java index 159d8902d..8c5f1b506 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenSession.java +++ b/src/main/java/com/omertron/themoviedbapi/model/authentication/TokenSession.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.authentication; +package com.omertron.themoviedbapi.model.authentication; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; public class TokenSession extends AbstractJsonMapping { diff --git a/src/main/java/com/omertron/themoviedbapi/model2/change/ChangeKeyItem.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java similarity index 92% rename from src/main/java/com/omertron/themoviedbapi/model2/change/ChangeKeyItem.java rename to src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java index 62e32f6e4..130fd1a5c 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/change/ChangeKeyItem.java +++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.change; +package com.omertron.themoviedbapi.model.change; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/change/ChangeListItem.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangeListItem.java similarity index 92% rename from src/main/java/com/omertron/themoviedbapi/model2/change/ChangeListItem.java rename to src/main/java/com/omertron/themoviedbapi/model/change/ChangeListItem.java index 5f7a8d04c..f10d9dce4 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/change/ChangeListItem.java +++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangeListItem.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.change; +package com.omertron.themoviedbapi.model.change; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; public class ChangeListItem extends AbstractJsonMapping { diff --git a/src/main/java/com/omertron/themoviedbapi/model2/change/ChangedItem.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/change/ChangedItem.java rename to src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java index 7c4c58e37..34172ffd4 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/change/ChangedItem.java +++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.change; +package com.omertron.themoviedbapi.model.change; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; public class ChangedItem extends AbstractJsonMapping { diff --git a/src/main/java/com/omertron/themoviedbapi/model2/collection/Collection.java b/src/main/java/com/omertron/themoviedbapi/model/collection/Collection.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/collection/Collection.java rename to src/main/java/com/omertron/themoviedbapi/model/collection/Collection.java index 125c31ada..1c9aefd53 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/collection/Collection.java +++ b/src/main/java/com/omertron/themoviedbapi/model/collection/Collection.java @@ -17,11 +17,11 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.collection; +package com.omertron.themoviedbapi.model.collection; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/collection/CollectionInfo.java b/src/main/java/com/omertron/themoviedbapi/model/collection/CollectionInfo.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/collection/CollectionInfo.java rename to src/main/java/com/omertron/themoviedbapi/model/collection/CollectionInfo.java index 89ceca031..dcfb55d06 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/collection/CollectionInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/model/collection/CollectionInfo.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.collection; +package com.omertron.themoviedbapi.model.collection; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/company/Company.java b/src/main/java/com/omertron/themoviedbapi/model/company/Company.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/company/Company.java rename to src/main/java/com/omertron/themoviedbapi/model/company/Company.java index eb5da77bb..f091fae9f 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/company/Company.java +++ b/src/main/java/com/omertron/themoviedbapi/model/company/Company.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.company; +package com.omertron.themoviedbapi.model.company; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; /** * Company information diff --git a/src/main/java/com/omertron/themoviedbapi/model2/config/Configuration.java b/src/main/java/com/omertron/themoviedbapi/model/config/Configuration.java similarity index 98% rename from src/main/java/com/omertron/themoviedbapi/model2/config/Configuration.java rename to src/main/java/com/omertron/themoviedbapi/model/config/Configuration.java index cdf25bd39..11e65fe50 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/config/Configuration.java +++ b/src/main/java/com/omertron/themoviedbapi/model/config/Configuration.java @@ -17,11 +17,11 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.config; +package com.omertron.themoviedbapi.model.config; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.net.MalformedURLException; import java.net.URL; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/config/JobDepartment.java b/src/main/java/com/omertron/themoviedbapi/model/config/JobDepartment.java similarity index 92% rename from src/main/java/com/omertron/themoviedbapi/model2/config/JobDepartment.java rename to src/main/java/com/omertron/themoviedbapi/model/config/JobDepartment.java index 288f5a1a6..3b7880640 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/config/JobDepartment.java +++ b/src/main/java/com/omertron/themoviedbapi/model/config/JobDepartment.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.config; +package com.omertron.themoviedbapi.model.config; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.List; public class JobDepartment extends AbstractJsonMapping { diff --git a/src/main/java/com/omertron/themoviedbapi/model2/discover/Discover.java b/src/main/java/com/omertron/themoviedbapi/model/discover/Discover.java similarity index 99% rename from src/main/java/com/omertron/themoviedbapi/model2/discover/Discover.java rename to src/main/java/com/omertron/themoviedbapi/model/discover/Discover.java index d2f975048..90c41071f 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/discover/Discover.java +++ b/src/main/java/com/omertron/themoviedbapi/model/discover/Discover.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not;private see . * */ -package com.omertron.themoviedbapi.model2.discover; +package com.omertron.themoviedbapi.model.discover; import com.omertron.themoviedbapi.enumeration.SortBy; import com.omertron.themoviedbapi.tools.Param; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/discover/WithBuilder.java b/src/main/java/com/omertron/themoviedbapi/model/discover/WithBuilder.java similarity index 97% rename from src/main/java/com/omertron/themoviedbapi/model2/discover/WithBuilder.java rename to src/main/java/com/omertron/themoviedbapi/model/discover/WithBuilder.java index 71d685364..e9aa9063a 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/discover/WithBuilder.java +++ b/src/main/java/com/omertron/themoviedbapi/model/discover/WithBuilder.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.discover; +package com.omertron.themoviedbapi.model.discover; /** * Class to create a String for the "with???" parameters of the Discover method diff --git a/src/main/java/com/omertron/themoviedbapi/model2/keyword/Keyword.java b/src/main/java/com/omertron/themoviedbapi/model/keyword/Keyword.java similarity index 90% rename from src/main/java/com/omertron/themoviedbapi/model2/keyword/Keyword.java rename to src/main/java/com/omertron/themoviedbapi/model/keyword/Keyword.java index 246dd03fa..00a6b6184 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/keyword/Keyword.java +++ b/src/main/java/com/omertron/themoviedbapi/model/keyword/Keyword.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.keyword; +package com.omertron.themoviedbapi.model.keyword; import com.fasterxml.jackson.annotation.JsonRootName; -import com.omertron.themoviedbapi.model2.AbstractIdName; +import com.omertron.themoviedbapi.model.AbstractIdName; /** * @author stuart.boston diff --git a/src/main/java/com/omertron/themoviedbapi/model2/list/ListItem.java b/src/main/java/com/omertron/themoviedbapi/model/list/ListItem.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/list/ListItem.java rename to src/main/java/com/omertron/themoviedbapi/model/list/ListItem.java index 16b0ae6cf..0531db366 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/list/ListItem.java +++ b/src/main/java/com/omertron/themoviedbapi/model/list/ListItem.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.list; +package com.omertron.themoviedbapi.model.list; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/list/ListItemStatus.java b/src/main/java/com/omertron/themoviedbapi/model/list/ListItemStatus.java similarity index 92% rename from src/main/java/com/omertron/themoviedbapi/model2/list/ListItemStatus.java rename to src/main/java/com/omertron/themoviedbapi/model/list/ListItemStatus.java index 2d44e68e0..63390246d 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/list/ListItemStatus.java +++ b/src/main/java/com/omertron/themoviedbapi/model/list/ListItemStatus.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.list; +package com.omertron.themoviedbapi.model.list; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/list/ListStatusCode.java b/src/main/java/com/omertron/themoviedbapi/model/list/ListStatusCode.java similarity index 91% rename from src/main/java/com/omertron/themoviedbapi/model2/list/ListStatusCode.java rename to src/main/java/com/omertron/themoviedbapi/model/list/ListStatusCode.java index 981966e44..b889d953f 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/list/ListStatusCode.java +++ b/src/main/java/com/omertron/themoviedbapi/model/list/ListStatusCode.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not;private see . * */ -package com.omertron.themoviedbapi.model2.list; +package com.omertron.themoviedbapi.model.list; -import com.omertron.themoviedbapi.model2.StatusCode; +import com.omertron.themoviedbapi.model.StatusCode; import com.fasterxml.jackson.annotation.JsonProperty; public class ListStatusCode extends StatusCode { diff --git a/src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java b/src/main/java/com/omertron/themoviedbapi/model/list/UserList.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java rename to src/main/java/com/omertron/themoviedbapi/model/list/UserList.java index ef1fe0d5b..4852bb894 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java +++ b/src/main/java/com/omertron/themoviedbapi/model/list/UserList.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.list; +package com.omertron.themoviedbapi.model.list; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaBasic.java b/src/main/java/com/omertron/themoviedbapi/model/media/MediaBasic.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/media/MediaBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/media/MediaBasic.java index d7547ca47..00d93d749 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/media/MediaBasic.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.media; +package com.omertron.themoviedbapi.model.media; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; /** * Basic media information diff --git a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaCredit.java b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCredit.java similarity index 93% rename from src/main/java/com/omertron/themoviedbapi/model2/media/MediaCredit.java rename to src/main/java/com/omertron/themoviedbapi/model/media/MediaCredit.java index b20087c0a..9d37ef19d 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaCredit.java +++ b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCredit.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.media; +package com.omertron.themoviedbapi.model.media; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; /** * diff --git a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditCast.java b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCast.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditCast.java rename to src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCast.java index b3646a574..5fc858e46 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditCast.java +++ b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCast.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.media; +package com.omertron.themoviedbapi.model.media; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditCrew.java b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCrew.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditCrew.java rename to src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCrew.java index 733a9ac99..4b4eedefd 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditCrew.java +++ b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditCrew.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.media; +package com.omertron.themoviedbapi.model.media; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditList.java b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditList.java similarity index 93% rename from src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditList.java rename to src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditList.java index 396351cf4..4c6b6f1ba 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaCreditList.java +++ b/src/main/java/com/omertron/themoviedbapi/model/media/MediaCreditList.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.media; +package com.omertron.themoviedbapi.model.media; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaState.java b/src/main/java/com/omertron/themoviedbapi/model/media/MediaState.java similarity index 94% rename from src/main/java/com/omertron/themoviedbapi/model2/media/MediaState.java rename to src/main/java/com/omertron/themoviedbapi/model/media/MediaState.java index dd86208fa..dcba9f7aa 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/media/MediaState.java +++ b/src/main/java/com/omertron/themoviedbapi/model/media/MediaState.java @@ -17,11 +17,11 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.media; +package com.omertron.themoviedbapi.model.media; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; /** * diff --git a/src/main/java/com/omertron/themoviedbapi/model2/media/RatedValue.java b/src/main/java/com/omertron/themoviedbapi/model/media/RatedValue.java similarity index 91% rename from src/main/java/com/omertron/themoviedbapi/model2/media/RatedValue.java rename to src/main/java/com/omertron/themoviedbapi/model/media/RatedValue.java index 2ec203c29..139fb52b7 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/media/RatedValue.java +++ b/src/main/java/com/omertron/themoviedbapi/model/media/RatedValue.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.media; +package com.omertron.themoviedbapi.model.media; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; /** * diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/AlternativeTitle.java b/src/main/java/com/omertron/themoviedbapi/model/movie/AlternativeTitle.java similarity index 97% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/AlternativeTitle.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/AlternativeTitle.java index 1132ae483..0bd65f851 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/AlternativeTitle.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/AlternativeTitle.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieBasic.java b/src/main/java/com/omertron/themoviedbapi/model/movie/MovieBasic.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/MovieBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/MovieBasic.java index 09c370997..90f927047 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/MovieBasic.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.media.MediaBasic; +import com.omertron.themoviedbapi.model.media.MediaBasic; /** * Basic Movie information diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieDb.java b/src/main/java/com/omertron/themoviedbapi/model/movie/MovieDb.java similarity index 94% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/MovieDb.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/MovieDb.java index 7e02fbb15..55013a9d7 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieDb.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/MovieDb.java @@ -17,20 +17,20 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; -import com.omertron.themoviedbapi.model2.Genre; -import com.omertron.themoviedbapi.model2.Language; -import com.omertron.themoviedbapi.model2.artwork.Artwork; -import com.omertron.themoviedbapi.model2.collection.Collection; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.media.MediaCreditCast; -import com.omertron.themoviedbapi.model2.media.MediaCreditCrew; -import com.omertron.themoviedbapi.model2.media.MediaCreditList; -import com.omertron.themoviedbapi.model2.review.Review; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.Genre; +import com.omertron.themoviedbapi.model.Language; +import com.omertron.themoviedbapi.model.artwork.Artwork; +import com.omertron.themoviedbapi.model.collection.Collection; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.list.UserList; +import com.omertron.themoviedbapi.model.media.MediaCreditCast; +import com.omertron.themoviedbapi.model.media.MediaCreditCrew; +import com.omertron.themoviedbapi.model.media.MediaCreditList; +import com.omertron.themoviedbapi.model.review.Review; import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles; import com.omertron.themoviedbapi.wrapper.WrapperImages; import com.omertron.themoviedbapi.wrapper.WrapperMovie; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCompany.java b/src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCompany.java similarity index 90% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCompany.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCompany.java index ee8f9e00e..3da6fee9b 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCompany.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCompany.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; import com.fasterxml.jackson.annotation.JsonRootName; -import com.omertron.themoviedbapi.model2.AbstractIdName; +import com.omertron.themoviedbapi.model.AbstractIdName; /** * @author stuart.boston diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCountry.java b/src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCountry.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCountry.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCountry.java index da13d26cd..b0c245945 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCountry.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCountry.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/ReleaseInfo.java b/src/main/java/com/omertron/themoviedbapi/model/movie/ReleaseInfo.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/ReleaseInfo.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/ReleaseInfo.java index 54ec2b494..776c13b06 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/ReleaseInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/ReleaseInfo.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/Trailer.java b/src/main/java/com/omertron/themoviedbapi/model/movie/Trailer.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/Trailer.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/Trailer.java index ff1fa9ab8..9ccd7782a 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/Trailer.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/Trailer.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/Translation.java b/src/main/java/com/omertron/themoviedbapi/model/movie/Translation.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/Translation.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/Translation.java index dfa796565..61deb7f7a 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/Translation.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/Translation.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/Video.java b/src/main/java/com/omertron/themoviedbapi/model/movie/Video.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/movie/Video.java rename to src/main/java/com/omertron/themoviedbapi/model/movie/Video.java index 7971823dc..c5a0e6394 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/movie/Video.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/Video.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.movie; +package com.omertron.themoviedbapi.model.movie; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/network/Network.java b/src/main/java/com/omertron/themoviedbapi/model/network/Network.java similarity index 92% rename from src/main/java/com/omertron/themoviedbapi/model2/network/Network.java rename to src/main/java/com/omertron/themoviedbapi/model/network/Network.java index 3227135f7..140fea951 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/network/Network.java +++ b/src/main/java/com/omertron/themoviedbapi/model/network/Network.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.network; +package com.omertron.themoviedbapi.model.network; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/CreditBasic.java b/src/main/java/com/omertron/themoviedbapi/model/person/CreditBasic.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model2/person/CreditBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/person/CreditBasic.java index eebf5f736..2631ee0c6 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/CreditBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/CreditBasic.java @@ -17,13 +17,13 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; 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.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; /** * @author stuart.boston diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/CreditInfo.java b/src/main/java/com/omertron/themoviedbapi/model/person/CreditInfo.java similarity index 93% rename from src/main/java/com/omertron/themoviedbapi/model2/person/CreditInfo.java rename to src/main/java/com/omertron/themoviedbapi/model/person/CreditInfo.java index 94b0a13b8..c8022df9c 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/CreditInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/CreditInfo.java @@ -17,11 +17,11 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.tv.TVCredit; +import com.omertron.themoviedbapi.model.tv.TVCredit; /** * @author stuart.boston diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/CreditMovieBasic.java b/src/main/java/com/omertron/themoviedbapi/model/person/CreditMovieBasic.java similarity index 97% rename from src/main/java/com/omertron/themoviedbapi/model2/person/CreditMovieBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/person/CreditMovieBasic.java index b160c18b3..cd20d6718 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/CreditMovieBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/CreditMovieBasic.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.enumeration.MediaType; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/CreditTVBasic.java b/src/main/java/com/omertron/themoviedbapi/model/person/CreditTVBasic.java similarity index 97% rename from src/main/java/com/omertron/themoviedbapi/model2/person/CreditTVBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/person/CreditTVBasic.java index 3d055ac19..7703ea2fa 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/CreditTVBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/CreditTVBasic.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.enumeration.MediaType; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/ExternalID.java b/src/main/java/com/omertron/themoviedbapi/model/person/ExternalID.java similarity index 94% rename from src/main/java/com/omertron/themoviedbapi/model2/person/ExternalID.java rename to src/main/java/com/omertron/themoviedbapi/model/person/ExternalID.java index 805163069..ffe4aa6f7 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/ExternalID.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/ExternalID.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; /** * diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/Person.java b/src/main/java/com/omertron/themoviedbapi/model/person/Person.java similarity index 98% rename from src/main/java/com/omertron/themoviedbapi/model2/person/Person.java rename to src/main/java/com/omertron/themoviedbapi/model/person/Person.java index 63f1a0d79..656654eac 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/Person.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/Person.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/PersonBasic.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonBasic.java similarity index 89% rename from src/main/java/com/omertron/themoviedbapi/model2/person/PersonBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/person/PersonBasic.java index b05b91810..eff81905f 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/PersonBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonBasic.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; -import com.omertron.themoviedbapi.model2.AbstractIdName; +import com.omertron.themoviedbapi.model.AbstractIdName; /** * @author stuart.boston diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/PersonCredits.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredits.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/person/PersonCredits.java rename to src/main/java/com/omertron/themoviedbapi/model/person/PersonCredits.java index 07e85541f..b0b43fe52 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/PersonCredits.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredits.java @@ -17,13 +17,13 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; 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.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/PersonFind.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonFind.java similarity index 89% rename from src/main/java/com/omertron/themoviedbapi/model2/person/PersonFind.java rename to src/main/java/com/omertron/themoviedbapi/model/person/PersonFind.java index c86a659a5..0aebabd78 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/person/PersonFind.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonFind.java @@ -17,16 +17,16 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.person; +package com.omertron.themoviedbapi.model.person; 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.model2.media.MediaBasic; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.tv.TVBasic; -import com.omertron.themoviedbapi.model2.tv.TVEpisodeBasic; +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.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/review/Review.java b/src/main/java/com/omertron/themoviedbapi/model/review/Review.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/review/Review.java rename to src/main/java/com/omertron/themoviedbapi/model/review/Review.java index b73b3028d..a11986e69 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/review/Review.java +++ b/src/main/java/com/omertron/themoviedbapi/model/review/Review.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.review; +package com.omertron.themoviedbapi.model.review; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVBasic.java b/src/main/java/com/omertron/themoviedbapi/model/tv/TVBasic.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/tv/TVBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/tv/TVBasic.java index 00bbfd70e..9e91d31cb 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/TVBasic.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.tv; +package com.omertron.themoviedbapi.model.tv; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.media.MediaBasic; +import com.omertron.themoviedbapi.model.media.MediaBasic; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVCredit.java b/src/main/java/com/omertron/themoviedbapi/model/tv/TVCredit.java similarity index 94% rename from src/main/java/com/omertron/themoviedbapi/model2/tv/TVCredit.java rename to src/main/java/com/omertron/themoviedbapi/model/tv/TVCredit.java index 41532e848..fdaf30430 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVCredit.java +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/TVCredit.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.tv; +package com.omertron.themoviedbapi.model.tv; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.AbstractIdName; +import com.omertron.themoviedbapi.model.AbstractIdName; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVEpisodeBasic.java b/src/main/java/com/omertron/themoviedbapi/model/tv/TVEpisodeBasic.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model2/tv/TVEpisodeBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/tv/TVEpisodeBasic.java index f884b83d5..ebcd70c5d 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVEpisodeBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/TVEpisodeBasic.java @@ -17,10 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.tv; +package com.omertron.themoviedbapi.model.tv; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.media.MediaBasic; +import com.omertron.themoviedbapi.model.media.MediaBasic; /** * TV Favorite information diff --git a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVSeasonBasic.java b/src/main/java/com/omertron/themoviedbapi/model/tv/TVSeasonBasic.java similarity index 93% rename from src/main/java/com/omertron/themoviedbapi/model2/tv/TVSeasonBasic.java rename to src/main/java/com/omertron/themoviedbapi/model/tv/TVSeasonBasic.java index 52b2c7716..dc0fa8c45 100644 --- a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVSeasonBasic.java +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/TVSeasonBasic.java @@ -17,9 +17,9 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model2.tv; +package com.omertron.themoviedbapi.model.tv; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java b/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java index afc0e1bde..43538833b 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java @@ -19,7 +19,7 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.omertron.themoviedbapi.model2.AbstractJsonMapping; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java index 7ad460f2b..1603771cf 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.movie.AlternativeTitle; +import com.omertron.themoviedbapi.model.movie.AlternativeTitle; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java index 42ac74f90..9997d025b 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.change.ChangeKeyItem; +import com.omertron.themoviedbapi.model.change.ChangeKeyItem; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java index e6c6c74cb..2940dd261 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.collection.Collection; +import com.omertron.themoviedbapi.model.collection.Collection; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java index cf8f1897f..78d24353f 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.company.Company; +import com.omertron.themoviedbapi.model.company.Company; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java index 2715332fe..13657fee6 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; +import com.omertron.themoviedbapi.model.movie.MovieBasic; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java index b06c26a1b..98be2fae6 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java +++ b/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.model2.config.Configuration; +import com.omertron.themoviedbapi.model.config.Configuration; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java index 9d9391d36..6756690ad 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.Genre; +import com.omertron.themoviedbapi.model.Genre; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java index 98e7a660e..05ef667e2 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.artwork.Artwork; +import com.omertron.themoviedbapi.model.artwork.Artwork; import com.omertron.themoviedbapi.enumeration.ArtworkType; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java index 76734f607..1221b26a6 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java +++ b/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.model2.config.JobDepartment; +import com.omertron.themoviedbapi.model.config.JobDepartment; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java index c734c60fe..7b6bc4547 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.keyword.Keyword; +import com.omertron.themoviedbapi.model.keyword.Keyword; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java index 191dfa0b4..3a1462f67 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.movie.MovieDb; +import com.omertron.themoviedbapi.model.movie.MovieDb; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieDbList.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieDbList.java index b17a4777e..b15505e0c 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieDbList.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieDbList.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.list.ListItem; +import com.omertron.themoviedbapi.model.list.ListItem; import java.util.List; public class WrapperMovieDbList extends AbstractWrapperAll { diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java index f15e62a93..a52a4955e 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.keyword.Keyword; +import com.omertron.themoviedbapi.model.keyword.Keyword; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMultiSearch.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMultiSearch.java index c6f5af1a6..7d92523fd 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMultiSearch.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMultiSearch.java @@ -22,10 +22,10 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.omertron.themoviedbapi.model2.media.MediaBasic; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.tv.TVBasic; -import com.omertron.themoviedbapi.model2.tv.TVEpisodeBasic; +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.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java index 914afd499..8fd301259 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.movie.ReleaseInfo; +import com.omertron.themoviedbapi.model.movie.ReleaseInfo; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReviews.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReviews.java index 9441ab615..d9b17f8a9 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReviews.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReviews.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.review.Review; +import com.omertron.themoviedbapi.model.review.Review; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java index 5d65035b1..129d4578e 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.movie.Translation; +import com.omertron.themoviedbapi.model.movie.Translation; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperUserList.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperUserList.java index 400f42d3a..fb81bf342 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperUserList.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperUserList.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model2.list.UserList; +import com.omertron.themoviedbapi.model.list.UserList; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperVideos.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperVideos.java index f04df1a54..320727689 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperVideos.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperVideos.java @@ -20,8 +20,8 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonSetter; -import com.omertron.themoviedbapi.model2.movie.Trailer; -import com.omertron.themoviedbapi.model2.movie.Video; +import com.omertron.themoviedbapi.model.movie.Trailer; +import com.omertron.themoviedbapi.model.movie.Video; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/omertron/themoviedbapi/AbstractTests.java b/src/test/java/com/omertron/themoviedbapi/AbstractTests.java index eb9ed21af..c96d3c591 100644 --- a/src/test/java/com/omertron/themoviedbapi/AbstractTests.java +++ b/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.model2.account.Account; -import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation; -import com.omertron.themoviedbapi.model2.authentication.TokenSession; +import com.omertron.themoviedbapi.model.account.Account; +import com.omertron.themoviedbapi.model.authentication.TokenAuthorisation; +import com.omertron.themoviedbapi.model.authentication.TokenSession; import com.omertron.themoviedbapi.tools.HttpTools; import java.io.File; import java.io.IOException; diff --git a/src/test/java/com/omertron/themoviedbapi/CompareTest.java b/src/test/java/com/omertron/themoviedbapi/CompareTest.java index 48837addf..68b75a97b 100644 --- a/src/test/java/com/omertron/themoviedbapi/CompareTest.java +++ b/src/test/java/com/omertron/themoviedbapi/CompareTest.java @@ -5,7 +5,7 @@ */ package com.omertron.themoviedbapi; -import com.omertron.themoviedbapi.model2.movie.MovieDb; +import com.omertron.themoviedbapi.model.movie.MovieDb; import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java index dc24acbaa..4e3090d36 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java @@ -23,12 +23,12 @@ import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.enumeration.MediaType; import com.omertron.themoviedbapi.enumeration.SortBy; -import com.omertron.themoviedbapi.model2.StatusCode; -import com.omertron.themoviedbapi.model2.account.Account; -import com.omertron.themoviedbapi.model2.authentication.TokenSession; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +import com.omertron.themoviedbapi.model.StatusCode; +import com.omertron.themoviedbapi.model.account.Account; +import com.omertron.themoviedbapi.model.authentication.TokenSession; +import com.omertron.themoviedbapi.model.list.UserList; +import com.omertron.themoviedbapi.model.movie.MovieBasic; +import com.omertron.themoviedbapi.model.tv.TVBasic; import java.util.List; import org.junit.After; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAuthenticationTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAuthenticationTest.java index 68bfa7ff3..982a5ad1b 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAuthenticationTest.java +++ b/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.model2.authentication.TokenAuthorisation; -import com.omertron.themoviedbapi.model2.authentication.TokenSession; +import com.omertron.themoviedbapi.model.authentication.TokenAuthorisation; +import com.omertron.themoviedbapi.model.authentication.TokenSession; import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCertificationsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCertificationsTest.java index 5909474a1..fe7f220ea 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCertificationsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCertificationsTest.java @@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import static com.omertron.themoviedbapi.AbstractTests.doConfiguration; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.Certification; +import com.omertron.themoviedbapi.model.Certification; import com.omertron.themoviedbapi.results.TmdbResultsMap; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java index 51443a2b4..9d7199595 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.change.ChangeListItem; +import com.omertron.themoviedbapi.model.change.ChangeListItem; import com.omertron.themoviedbapi.tools.MethodBase; import java.util.List; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCollectionsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCollectionsTest.java index 3a64526e1..e31493d3d 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCollectionsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCollectionsTest.java @@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.artwork.Artwork; -import com.omertron.themoviedbapi.model2.collection.CollectionInfo; +import com.omertron.themoviedbapi.model.artwork.Artwork; +import com.omertron.themoviedbapi.model.collection.CollectionInfo; import com.omertron.themoviedbapi.results.TmdbResultsList; import org.junit.AfterClass; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCompaniesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCompaniesTest.java index eef25701d..e7e52f2b7 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCompaniesTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCompaniesTest.java @@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.company.Company; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; +import com.omertron.themoviedbapi.model.company.Company; +import com.omertron.themoviedbapi.model.movie.MovieBasic; import java.util.List; import org.junit.After; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java index f7e06ce9e..ee1b711a9 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java @@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.config.Configuration; -import com.omertron.themoviedbapi.model2.config.JobDepartment; +import com.omertron.themoviedbapi.model.config.Configuration; +import com.omertron.themoviedbapi.model.config.JobDepartment; import com.omertron.themoviedbapi.results.TmdbResultsList; import java.util.List; import java.util.Map; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCreditsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCreditsTest.java index 8508edf93..d199e7fff 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbCreditsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbCreditsTest.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.person.CreditInfo; +import com.omertron.themoviedbapi.model.person.CreditInfo; import org.junit.After; import org.junit.AfterClass; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java index 2462d02c2..422d28dae 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java @@ -21,9 +21,9 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.discover.Discover; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +import com.omertron.themoviedbapi.model.discover.Discover; +import com.omertron.themoviedbapi.model.movie.MovieBasic; +import com.omertron.themoviedbapi.model.tv.TVBasic; import java.util.List; import org.junit.After; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbFindTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbFindTest.java index 585cba543..1836885d1 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbFindTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbFindTest.java @@ -23,10 +23,10 @@ import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.TestID; import com.omertron.themoviedbapi.enumeration.ExternalSource; -import com.omertron.themoviedbapi.model2.FindResults; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; -import com.omertron.themoviedbapi.model2.person.PersonFind; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +import com.omertron.themoviedbapi.model.FindResults; +import com.omertron.themoviedbapi.model.movie.MovieBasic; +import com.omertron.themoviedbapi.model.person.PersonFind; +import com.omertron.themoviedbapi.model.tv.TVBasic; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbGenresTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbGenresTest.java index a8afe08dc..24ceb3233 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbGenresTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbGenresTest.java @@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.Genre; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; +import com.omertron.themoviedbapi.model.Genre; +import com.omertron.themoviedbapi.model.movie.MovieBasic; import com.omertron.themoviedbapi.results.TmdbResultsList; import java.util.List; import org.junit.After; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbKeywordsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbKeywordsTest.java index f22ff8463..0fe895b5b 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbKeywordsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbKeywordsTest.java @@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.movie.MovieBasic; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.movie.MovieBasic; import com.omertron.themoviedbapi.results.TmdbResultsList; import org.junit.After; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java index 9e93ddb52..a58a3b9b2 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java @@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.StatusCode; -import com.omertron.themoviedbapi.model2.list.ListItem; +import com.omertron.themoviedbapi.model.StatusCode; +import com.omertron.themoviedbapi.model.list.ListItem; import java.util.Random; import org.apache.commons.lang3.StringUtils; import org.junit.After; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java index 920fa3e29..b11e9041a 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java @@ -25,21 +25,21 @@ import static com.omertron.themoviedbapi.AbstractTests.getHttpTools; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.TestID; import com.omertron.themoviedbapi.enumeration.ArtworkType; -import com.omertron.themoviedbapi.model2.StatusCode; -import com.omertron.themoviedbapi.model2.movie.MovieDb; -import com.omertron.themoviedbapi.model2.movie.ReleaseInfo; -import com.omertron.themoviedbapi.model2.movie.Translation; -import com.omertron.themoviedbapi.model2.movie.Video; -import com.omertron.themoviedbapi.model2.artwork.Artwork; -import com.omertron.themoviedbapi.model2.change.ChangeKeyItem; -import com.omertron.themoviedbapi.model2.change.ChangeListItem; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.media.MediaCreditCast; -import com.omertron.themoviedbapi.model2.media.MediaCreditList; -import com.omertron.themoviedbapi.model2.media.MediaState; -import com.omertron.themoviedbapi.model2.movie.AlternativeTitle; -import com.omertron.themoviedbapi.model2.review.Review; +import com.omertron.themoviedbapi.model.StatusCode; +import com.omertron.themoviedbapi.model.movie.MovieDb; +import com.omertron.themoviedbapi.model.movie.ReleaseInfo; +import com.omertron.themoviedbapi.model.movie.Translation; +import com.omertron.themoviedbapi.model.movie.Video; +import com.omertron.themoviedbapi.model.artwork.Artwork; +import com.omertron.themoviedbapi.model.change.ChangeKeyItem; +import com.omertron.themoviedbapi.model.change.ChangeListItem; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.list.UserList; +import com.omertron.themoviedbapi.model.media.MediaCreditCast; +import com.omertron.themoviedbapi.model.media.MediaCreditList; +import com.omertron.themoviedbapi.model.media.MediaState; +import com.omertron.themoviedbapi.model.movie.AlternativeTitle; +import com.omertron.themoviedbapi.model.review.Review; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.MethodBase; import com.omertron.themoviedbapi.wrapper.WrapperChanges; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbNetworksTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbNetworksTest.java index c9c3dc7d6..aec3fda54 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbNetworksTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbNetworksTest.java @@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.TestID; -import com.omertron.themoviedbapi.model2.network.Network; +import com.omertron.themoviedbapi.model.network.Network; import java.util.ArrayList; import java.util.List; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java index ebecb26ba..c89b361b0 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java @@ -23,14 +23,14 @@ import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.TestID; import com.omertron.themoviedbapi.enumeration.ArtworkType; -import com.omertron.themoviedbapi.model2.artwork.Artwork; -import com.omertron.themoviedbapi.model2.artwork.ArtworkMedia; -import com.omertron.themoviedbapi.model2.change.ChangeKeyItem; -import com.omertron.themoviedbapi.model2.change.ChangeListItem; -import com.omertron.themoviedbapi.model2.person.ExternalID; -import com.omertron.themoviedbapi.model2.person.Person; -import com.omertron.themoviedbapi.model2.person.PersonCredits; -import com.omertron.themoviedbapi.model2.person.PersonFind; +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.change.ChangeListItem; +import com.omertron.themoviedbapi.model.person.ExternalID; +import com.omertron.themoviedbapi.model.person.Person; +import com.omertron.themoviedbapi.model.person.PersonCredits; +import com.omertron.themoviedbapi.model.person.PersonFind; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.MethodBase; import com.omertron.themoviedbapi.wrapper.WrapperChanges; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbReviewsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbReviewsTest.java index c2017a98d..00b507e21 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbReviewsTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbReviewsTest.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model2.review.Review; +import com.omertron.themoviedbapi.model.review.Review; import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java index 54a2416c1..ecf54ac7e 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java @@ -22,14 +22,14 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.enumeration.SearchType; -import com.omertron.themoviedbapi.model2.media.MediaBasic; -import com.omertron.themoviedbapi.model2.keyword.Keyword; -import com.omertron.themoviedbapi.model2.collection.Collection; -import com.omertron.themoviedbapi.model2.company.Company; -import com.omertron.themoviedbapi.model2.list.UserList; -import com.omertron.themoviedbapi.model2.movie.MovieDb; -import com.omertron.themoviedbapi.model2.person.PersonFind; -import com.omertron.themoviedbapi.model2.tv.TVBasic; +import com.omertron.themoviedbapi.model.media.MediaBasic; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.collection.Collection; +import com.omertron.themoviedbapi.model.company.Company; +import com.omertron.themoviedbapi.model.list.UserList; +import com.omertron.themoviedbapi.model.movie.MovieDb; +import com.omertron.themoviedbapi.model.person.PersonFind; +import com.omertron.themoviedbapi.model.tv.TVBasic; import com.omertron.themoviedbapi.results.TmdbResultsList; import org.junit.After; import org.junit.AfterClass;