diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java index 939b50702..0771b00fc 100644 --- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java +++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java @@ -43,21 +43,21 @@ import com.omertron.themoviedbapi.model.Account; import com.omertron.themoviedbapi.model.AlternativeTitle; import com.omertron.themoviedbapi.model.Artwork; import com.omertron.themoviedbapi.model.Certification; -import com.omertron.themoviedbapi.model.ChangedMedia; +import com.omertron.themoviedbapi.model.change.ChangedMedia; import com.omertron.themoviedbapi.model.Collection; import com.omertron.themoviedbapi.model.CollectionInfo; import com.omertron.themoviedbapi.model.Company; import com.omertron.themoviedbapi.model.Configuration; -import com.omertron.themoviedbapi.model.Discover; +import com.omertron.themoviedbapi.model.discover.Discover; import com.omertron.themoviedbapi.model.Genre; import com.omertron.themoviedbapi.model.JobDepartment; -import com.omertron.themoviedbapi.model.Keyword; -import com.omertron.themoviedbapi.model.KeywordMovie; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.keyword.KeywordMovie; import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.model.MovieDbList; import com.omertron.themoviedbapi.model.MovieList; -import com.omertron.themoviedbapi.model.Person; -import com.omertron.themoviedbapi.model.PersonCredit; +import com.omertron.themoviedbapi.model.person.Person; +import com.omertron.themoviedbapi.model.person.PersonCredit; import com.omertron.themoviedbapi.model.ReleaseInfo; import com.omertron.themoviedbapi.model.Reviews; import com.omertron.themoviedbapi.model.StatusCode; diff --git a/src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java b/src/main/java/com/omertron/themoviedbapi/enumeration/ArtworkType.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java rename to src/main/java/com/omertron/themoviedbapi/enumeration/ArtworkType.java index 091319f1a..373dd9886 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ArtworkType.java +++ b/src/main/java/com/omertron/themoviedbapi/enumeration/ArtworkType.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.enumeration; /** * ArtworkType enum List of the artwork types that are available diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java index cf9bf2b6d..187c98abc 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java @@ -132,6 +132,12 @@ public class TmdbAccount extends AbstractMethod { * @throws MovieDbException */ public List getFavoriteTv(String sessionId, int accountId) throws MovieDbException { + TmdbParameters parameters = new TmdbParameters(); + parameters.add(Param.SESSION, sessionId); + + URL url = new ApiUrl(apiKey, MethodBase.ACCOUNT).setSubMethod(accountId,MethodSub.FAVORITE_TV).buildUrl(parameters); + String webpage = httpTools.getRequest(url); + throw new MovieDbException(ApiExceptionType.UNKNOWN_CAUSE, "Not implemented yet"); } diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java index cb3a8e692..b4de487be 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model.ChangedMedia; +import com.omertron.themoviedbapi.model.change.ChangedMedia; 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/TmdbCollections.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java index 2c4308443..fb935096b 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.model.Artwork; -import com.omertron.themoviedbapi.model.ArtworkType; +import com.omertron.themoviedbapi.enumeration.ArtworkType; import com.omertron.themoviedbapi.model.CollectionInfo; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java index 1ab00a66b..130118be5 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model.Discover; +import com.omertron.themoviedbapi.model.discover.Discover; import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.ApiUrl; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java index 7b5ca4e0b..83a262f6e 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.model.Keyword; -import com.omertron.themoviedbapi.model.KeywordMovie; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.keyword.KeywordMovie; 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/TmdbMovies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java index e0e73ca95..92eb87211 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java @@ -22,10 +22,10 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.model.AlternativeTitle; import com.omertron.themoviedbapi.model.Artwork; -import com.omertron.themoviedbapi.model.Keyword; +import com.omertron.themoviedbapi.model.keyword.Keyword; import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.model.MovieList; -import com.omertron.themoviedbapi.model.Person; +import com.omertron.themoviedbapi.model.person.Person; import com.omertron.themoviedbapi.model.ReleaseInfo; import com.omertron.themoviedbapi.model.StatusCode; import com.omertron.themoviedbapi.model.Translation; diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java index a91ea0eb8..2b968aa24 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java @@ -21,9 +21,9 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.model.Artwork; -import com.omertron.themoviedbapi.model.ArtworkType; -import com.omertron.themoviedbapi.model.Person; -import com.omertron.themoviedbapi.model.PersonCredit; +import com.omertron.themoviedbapi.enumeration.ArtworkType; +import com.omertron.themoviedbapi.model.person.Person; +import com.omertron.themoviedbapi.model.person.PersonCredit; 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/TmdbSearch.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java index 58e71d248..4823f02b1 100644 --- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java +++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java @@ -22,10 +22,10 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.model.Collection; import com.omertron.themoviedbapi.model.Company; -import com.omertron.themoviedbapi.model.Keyword; +import com.omertron.themoviedbapi.model.keyword.Keyword; import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.model.MovieList; -import com.omertron.themoviedbapi.model.Person; +import com.omertron.themoviedbapi.model.person.Person; 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/model/Artwork.java b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java index 38ae56f45..03e1f182e 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Artwork.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java @@ -19,6 +19,7 @@ */ package com.omertron.themoviedbapi.model; +import com.omertron.themoviedbapi.enumeration.ArtworkType; 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/model/MovieDb.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java index 6fbd8b3c2..0b00fa8cb 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java +++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java @@ -19,6 +19,9 @@ */ package com.omertron.themoviedbapi.model; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.person.PersonCast; +import com.omertron.themoviedbapi.model.person.PersonCrew; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles; import com.omertron.themoviedbapi.wrapper.WrapperImages; diff --git a/src/main/java/com/omertron/themoviedbapi/model/ChangeKeyItem.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java similarity index 97% rename from src/main/java/com/omertron/themoviedbapi/model/ChangeKeyItem.java rename to src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java index 491740408..32ac5632f 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ChangeKeyItem.java +++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangeKeyItem.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.change; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/src/main/java/com/omertron/themoviedbapi/model/ChangedItem.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model/ChangedItem.java rename to src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java index 1245e6288..a9f1a4183 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ChangedItem.java +++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java @@ -17,11 +17,12 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.change; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/omertron/themoviedbapi/model/ChangedMedia.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMedia.java similarity index 92% rename from src/main/java/com/omertron/themoviedbapi/model/ChangedMedia.java rename to src/main/java/com/omertron/themoviedbapi/model/change/ChangedMedia.java index 318f550ca..581865099 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ChangedMedia.java +++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMedia.java @@ -17,9 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.change; import com.fasterxml.jackson.annotation.JsonProperty; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; public class ChangedMedia extends AbstractJsonMapping { diff --git a/src/main/java/com/omertron/themoviedbapi/model/ChangedMovie.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMovie.java similarity index 92% rename from src/main/java/com/omertron/themoviedbapi/model/ChangedMovie.java rename to src/main/java/com/omertron/themoviedbapi/model/change/ChangedMovie.java index f3051c446..c6d55440b 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ChangedMovie.java +++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMovie.java @@ -17,9 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.change; import com.fasterxml.jackson.annotation.JsonProperty; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; public class ChangedMovie extends AbstractJsonMapping { diff --git a/src/main/java/com/omertron/themoviedbapi/model/comparator/PersonCreditDateComparator.java b/src/main/java/com/omertron/themoviedbapi/model/comparator/PersonCreditDateComparator.java index 32aee93c2..4b57b31e4 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/comparator/PersonCreditDateComparator.java +++ b/src/main/java/com/omertron/themoviedbapi/model/comparator/PersonCreditDateComparator.java @@ -19,7 +19,7 @@ */ package com.omertron.themoviedbapi.model.comparator; -import com.omertron.themoviedbapi.model.PersonCredit; +import com.omertron.themoviedbapi.model.person.PersonCredit; import java.io.Serializable; import java.util.Comparator; import java.util.regex.Matcher; diff --git a/src/main/java/com/omertron/themoviedbapi/model/Discover.java b/src/main/java/com/omertron/themoviedbapi/model/discover/Discover.java similarity index 99% rename from src/main/java/com/omertron/themoviedbapi/model/Discover.java rename to src/main/java/com/omertron/themoviedbapi/model/discover/Discover.java index f2ae0d9ca..a5010aa09 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/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.model; +package com.omertron.themoviedbapi.model.discover; import com.omertron.themoviedbapi.tools.Param; import com.omertron.themoviedbapi.tools.TmdbParameters; diff --git a/src/main/java/com/omertron/themoviedbapi/model/Keyword.java b/src/main/java/com/omertron/themoviedbapi/model/keyword/Keyword.java similarity index 90% rename from src/main/java/com/omertron/themoviedbapi/model/Keyword.java rename to src/main/java/com/omertron/themoviedbapi/model/keyword/Keyword.java index 20f186778..00a6b6184 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Keyword.java +++ b/src/main/java/com/omertron/themoviedbapi/model/keyword/Keyword.java @@ -17,9 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.keyword; import com.fasterxml.jackson.annotation.JsonRootName; +import com.omertron.themoviedbapi.model.AbstractIdName; /** * @author stuart.boston diff --git a/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java b/src/main/java/com/omertron/themoviedbapi/model/keyword/KeywordMovie.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java rename to src/main/java/com/omertron/themoviedbapi/model/keyword/KeywordMovie.java index 4dc11e0bd..6c804b43c 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java +++ b/src/main/java/com/omertron/themoviedbapi/model/keyword/KeywordMovie.java @@ -17,9 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.keyword; import com.fasterxml.jackson.annotation.JsonProperty; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; /** * @author Stuart diff --git a/src/main/java/com/omertron/themoviedbapi/model/Person.java b/src/main/java/com/omertron/themoviedbapi/model/person/Person.java similarity index 98% rename from src/main/java/com/omertron/themoviedbapi/model/Person.java rename to src/main/java/com/omertron/themoviedbapi/model/person/Person.java index 9bb2da42a..389d5bac5 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Person.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/Person.java @@ -17,9 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.person; import com.fasterxml.jackson.annotation.JsonProperty; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCast.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model/PersonCast.java rename to src/main/java/com/omertron/themoviedbapi/model/person/PersonCast.java index 724761e07..d0ad61d81 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCast.java @@ -17,9 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.person; import com.fasterxml.jackson.annotation.JsonProperty; +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/model/PersonCredit.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredit.java similarity index 98% rename from src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java rename to src/main/java/com/omertron/themoviedbapi/model/person/PersonCredit.java index 7636e0f3b..a504a0475 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredit.java @@ -17,9 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.person; import com.fasterxml.jackson.annotation.JsonProperty; +import com.omertron.themoviedbapi.model.AbstractJsonMapping; import java.util.Collections; import java.util.List; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCrew.java similarity index 96% rename from src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java rename to src/main/java/com/omertron/themoviedbapi/model/person/PersonCrew.java index 192f7e437..934757a30 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCrew.java @@ -17,9 +17,10 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.person; import com.fasterxml.jackson.annotation.JsonProperty; +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/model/PersonType.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonType.java similarity index 95% rename from src/main/java/com/omertron/themoviedbapi/model/PersonType.java rename to src/main/java/com/omertron/themoviedbapi/model/person/PersonType.java index daf8816ee..dc2661b2b 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/PersonType.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonType.java @@ -17,7 +17,7 @@ * along with TheMovieDB API. If not, see . * */ -package com.omertron.themoviedbapi.model; +package com.omertron.themoviedbapi.model.person; /** * @author stuart.boston diff --git a/src/main/java/com/omertron/themoviedbapi/model/tv/AbstractTv.java b/src/main/java/com/omertron/themoviedbapi/model/tv/AbstractTv.java new file mode 100644 index 000000000..57259e0e6 --- /dev/null +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/AbstractTv.java @@ -0,0 +1,20 @@ +package com.omertron.themoviedbapi.model.tv; + +import com.omertron.themoviedbapi.model.AbstractIdName; + +public class AbstractTv extends AbstractIdName { + + // Appendable responses for all tv elements +// @JsonProperty("credits") +// private Credits credits; + +// @JsonProperty("external_ids") +// private ExternalIds externalIds; + +// @JsonProperty("images") +// private MovieImages images; + +// @JsonProperty("videos") +// private Video.Results videos; + +} diff --git a/src/main/java/com/omertron/themoviedbapi/model/tv/Network.java b/src/main/java/com/omertron/themoviedbapi/model/tv/Network.java new file mode 100644 index 000000000..e3478f456 --- /dev/null +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/Network.java @@ -0,0 +1,7 @@ +package com.omertron.themoviedbapi.model.tv; + +import com.omertron.themoviedbapi.model.AbstractIdName; + +public class Network extends AbstractIdName { + +} diff --git a/src/main/java/com/omertron/themoviedbapi/model/tv/TvEpisode.java b/src/main/java/com/omertron/themoviedbapi/model/tv/TvEpisode.java new file mode 100644 index 000000000..86dbe173c --- /dev/null +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/TvEpisode.java @@ -0,0 +1,89 @@ +package com.omertron.themoviedbapi.model.tv; + +import com.fasterxml.jackson.annotation.JsonProperty; + + +public class TvEpisode extends AbstractTv { + + + @JsonProperty("overview") + private String overview; + + + @JsonProperty("air_date") + private String airDate; + + + @JsonProperty("episode_number") + private int episodeNumber; + + @JsonProperty("still_path") + private String stillPath; + + + @JsonProperty("vote_average") + private float voteAverage; + + @JsonProperty("vote_count") + private int voteCount; + + + public String getOverview() { + return overview; + } + + + public String getAirDate() { + return airDate; + } + + + public int getEpisodeNumber() { + return episodeNumber; + } + + + public String getStillPath() { + return stillPath; + } + + + public float getVoteAverage() { + return voteAverage; + } + + + public int getVoteCount() { + return voteCount; + } + + + public void setOverview(String overview) { + this.overview = overview; + } + + + public void setAirDate(String airDate) { + this.airDate = airDate; + } + + + public void setEpisodeNumber(int episodeNumber) { + this.episodeNumber = episodeNumber; + } + + + public void setStillPath(String stillPath) { + this.stillPath = stillPath; + } + + + public void setVoteAverage(float voteAverage) { + this.voteAverage = voteAverage; + } + + + public void setVoteCount(int voteCount) { + this.voteCount = voteCount; + } +} diff --git a/src/main/java/com/omertron/themoviedbapi/model/tv/TvSeason.java b/src/main/java/com/omertron/themoviedbapi/model/tv/TvSeason.java new file mode 100644 index 000000000..9dd2812e6 --- /dev/null +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/TvSeason.java @@ -0,0 +1,79 @@ +package com.omertron.themoviedbapi.model.tv; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + + +public class TvSeason extends AbstractTv { + + + @JsonProperty("air_date") + private String airDate; + + + @JsonProperty("poster_path") + private String posterPath; + + @JsonProperty("season_number") + private int seasonNumber; + + + @JsonProperty("overview") + private String overview; + + @JsonProperty("episodes") + private List episodes; + + + public String getAirDate() { + return airDate; + } + + + public String getPosterPath() { + return posterPath; + } + + + public int getSeasonNumber() { + return seasonNumber; + } + + + public void setEpisodes(List episodes) { + this.episodes = episodes; + } + + + public void setAirDate(String airDate) { + this.airDate = airDate; + } + + + public void setPosterPath(String posterPath) { + this.posterPath = posterPath; + } + + + public void setSeasonNumber(int seasonNumber) { + this.seasonNumber = seasonNumber; + } + + + public void setOverview(String overview) { + this.overview = overview; + } + + + public List getEpisodes() { + + + return episodes; + } + + + public String getOverview() { + return overview; + } +} diff --git a/src/main/java/com/omertron/themoviedbapi/model/tv/TvSeries.java b/src/main/java/com/omertron/themoviedbapi/model/tv/TvSeries.java new file mode 100644 index 000000000..e557639e9 --- /dev/null +++ b/src/main/java/com/omertron/themoviedbapi/model/tv/TvSeries.java @@ -0,0 +1,146 @@ +package com.omertron.themoviedbapi.model.tv; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.omertron.themoviedbapi.model.Genre; +import com.omertron.themoviedbapi.model.person.Person; +import java.util.List; + +public class TvSeries extends AbstractTv { + + @JsonProperty("created_by") + private List createdBy; + + @JsonProperty("episode_run_time") + private List episodeRuntime; + + @JsonProperty("first_air_date") + private String firstAirDate; + + @JsonProperty("last_air_date") + private String lastAirDate; + + @JsonProperty("genres") + private List genres; + + @JsonProperty("homepage") + private String homepage; + + @JsonProperty("original_name") + private String originalName; + + @JsonProperty("origin_country") + private List originCountry; + + @JsonProperty("networks") + private List networks; + + @JsonProperty("overview") + private String overview; + + @JsonProperty("popularity") + private float popularity; + + @JsonProperty("backdrop_path") + private String backdropPath; + + @JsonProperty("poster_path") + private String posterPath; + + @JsonProperty("number_of_episodes") + private int numberOfEpisodes; + + @JsonProperty("number_of_seasons") + private int numberOfSeasons; + + @JsonProperty("seasons") + private List seasons; + + @JsonProperty("vote_average") + private float voteAverage; + + @JsonProperty("vote_count") + private int voteCount; + + @JsonProperty("status") + private String status; + + public List getCreatedBy() { + return createdBy; + } + + public List getEpisodeRuntime() { + return episodeRuntime; + } + + public String getFirstAirDate() { + return firstAirDate; + } + + public String getLastAirDate() { + return lastAirDate; + } + + public List getGenres() { + return genres; + } + + public String getHomepage() { + return homepage; + } + + public String getOriginalName() { + return originalName; + } + + public List getOriginCountry() { + return originCountry; + } + + public List getNetworks() { + return networks; + } + + public String getOverview() { + return overview; + } + + public float getPopularity() { + return popularity; + } + + public String getBackdropPath() { + return backdropPath; + } + + public String getPosterPath() { + return posterPath; + } + + public int getNumberOfEpisodes() { + return numberOfEpisodes; + } + + public int getNumberOfSeasons() { + return numberOfSeasons; + } + + public List getSeasons() { + return seasons; + } + + public void setSeasons(List seasons) { + this.seasons = seasons; + } + + public float getVoteAverage() { + return voteAverage; + } + + public int getVoteCount() { + return voteCount; + } + + public String getStatus() { + return status; + } +} diff --git a/src/main/java/com/omertron/themoviedbapi/tools/MethodSub.java b/src/main/java/com/omertron/themoviedbapi/tools/MethodSub.java index 9b5df95f6..a46c703aa 100644 --- a/src/main/java/com/omertron/themoviedbapi/tools/MethodSub.java +++ b/src/main/java/com/omertron/themoviedbapi/tools/MethodSub.java @@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils; public enum MethodSub { + ADD_ITEM("add_item"), ALT_TITLES("alternative_titles"), CASTS("casts"), CHANGES("changes"), @@ -31,7 +32,8 @@ public enum MethodSub { COMPANY("company"), CREDITS("credits"), FAVORITE("favorite"), - FAVORITE_MOVIES("favorite_movies"), + FAVORITE_MOVIES("favorite/movies"), + FAVORITE_TV("favorite/tv"), GUEST_SESSION("guest_session/new"), IMAGES("images"), ITEM_STATUS("item_status"), @@ -42,15 +44,14 @@ public enum MethodSub { LISTS("lists"), MOVIE("movie"), MOVIES("movies"), - WATCHLIST("watchlist"), - WATCHLIST_MOVIES("watchlist/movies"), - WATCHLIST_TV("watchlist/tv"), + MOVIE_LIST("movie/list"), NOW_PLAYING("now-playing"), PERSON("person"), POPULAR("popular"), RATED_MOVIES("rated/movies"), RATING("rating"), RELEASES("releases"), + REMOVE_ITEM("remove_item"), REVIEWS("reviews"), SESSION_NEW("session/new"), SIMILAR_MOVIES("similar_movies"), @@ -58,13 +59,13 @@ public enum MethodSub { TOKEN_VALIDATE("token/validate_with_login"), TOP_RATED("top-rated"), TRANSLATIONS("translations"), + TV("tv"), + TV_LIST("tv/list"), UPCOMING("upcoming"), VIDEOS("videos"), - ADD_ITEM("add_item"), - REMOVE_ITEM("remove_item"), - MOVIE_LIST("movie/list"), - TV_LIST("tv/list"), - TV("tv"); + WATCHLIST("watchlist"), + WATCHLIST_MOVIES("watchlist/movies"), + WATCHLIST_TV("watchlist/tv"); private final String value; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java index 209af3a58..073a8dac0 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java @@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.ChangeKeyItem; +import com.omertron.themoviedbapi.model.change.ChangeKeyItem; import java.util.ArrayList; import java.util.HashMap; 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 f682e4a6e..f2243153c 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.Artwork; -import com.omertron.themoviedbapi.model.ArtworkType; +import com.omertron.themoviedbapi.enumeration.ArtworkType; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywordMovies.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywordMovies.java index ce3121ce3..3f23b0e04 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywordMovies.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywordMovies.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.KeywordMovie; +import com.omertron.themoviedbapi.model.keyword.KeywordMovie; 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 eaabc34e9..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.model.Keyword; +import com.omertron.themoviedbapi.model.keyword.Keyword; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMediaChanges.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMediaChanges.java index df246b8a4..b1862245b 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMediaChanges.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMediaChanges.java @@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.wrapper; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.ChangedMedia; +import com.omertron.themoviedbapi.model.change.ChangedMedia; public class WrapperMediaChanges extends AbstractWrapperAll { diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java index b2f822a9c..dea92bbc1 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java @@ -20,9 +20,9 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.Person; -import com.omertron.themoviedbapi.model.PersonCast; -import com.omertron.themoviedbapi.model.PersonCrew; +import com.omertron.themoviedbapi.model.person.Person; +import com.omertron.themoviedbapi.model.person.PersonCast; +import com.omertron.themoviedbapi.model.person.PersonCrew; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieChanges.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieChanges.java index 08980b1e4..7a72dd9d7 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieChanges.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieChanges.java @@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.wrapper; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.ChangedMovie; +import com.omertron.themoviedbapi.model.change.ChangedMovie; public class WrapperMovieChanges 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 2937b26d8..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.model.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/WrapperPerson.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java index 90fa0902d..717bb78e2 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.Person; +import com.omertron.themoviedbapi.model.person.Person; import java.util.List; /** diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java index d4aafdbbe..543180f6c 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java @@ -20,8 +20,8 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.PersonCredit; -import com.omertron.themoviedbapi.model.PersonType; +import com.omertron.themoviedbapi.model.person.PersonCredit; +import com.omertron.themoviedbapi.model.person.PersonType; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonList.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonList.java index 6bbe82279..8c2d495ff 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonList.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonList.java @@ -20,7 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.Person; +import com.omertron.themoviedbapi.model.person.Person; import java.util.List; /** diff --git a/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java index 8f8369a9b..ccb06435b 100644 --- a/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java +++ b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java @@ -21,20 +21,20 @@ package com.omertron.themoviedbapi; import com.omertron.themoviedbapi.model.AlternativeTitle; import com.omertron.themoviedbapi.model.Artwork; -import com.omertron.themoviedbapi.model.ChangedMedia; +import com.omertron.themoviedbapi.model.change.ChangedMedia; import com.omertron.themoviedbapi.model.Collection; import com.omertron.themoviedbapi.model.CollectionInfo; import com.omertron.themoviedbapi.model.Company; -import com.omertron.themoviedbapi.model.Discover; +import com.omertron.themoviedbapi.model.discover.Discover; import com.omertron.themoviedbapi.model.Genre; import com.omertron.themoviedbapi.model.JobDepartment; -import com.omertron.themoviedbapi.model.Keyword; -import com.omertron.themoviedbapi.model.KeywordMovie; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.keyword.KeywordMovie; import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.model.MovieDbList; import com.omertron.themoviedbapi.model.MovieList; -import com.omertron.themoviedbapi.model.Person; -import com.omertron.themoviedbapi.model.PersonCredit; +import com.omertron.themoviedbapi.model.person.Person; +import com.omertron.themoviedbapi.model.person.PersonCredit; import com.omertron.themoviedbapi.model.ReleaseInfo; import com.omertron.themoviedbapi.model.Reviews; import com.omertron.themoviedbapi.model.Configuration; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java index a7cd50f13..dafddb550 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java @@ -27,11 +27,14 @@ import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.model.MovieDbList; import com.omertron.themoviedbapi.model.StatusCode; import java.util.List; +import org.junit.After; import org.junit.AfterClass; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -59,6 +62,14 @@ public class TmdbAccountTest extends AbstractTests { public static void tearDownClass() { } + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + /** * Test of getAccountId method, of class TmdbAccount. * @@ -183,4 +194,64 @@ public class TmdbAccountTest extends AbstractTests { @Ignore("Tested as part of testGetWatchList") public void testModifyWatchList() throws MovieDbException { } + + /** + * Test of getFavoriteTv method, of class TmdbAccount. + * @throws com.omertron.themoviedbapi.MovieDbException + */ + @Test + public void testGetFavoriteTv() throws MovieDbException { + System.out.println("getFavoriteTv"); + List result = instance.getFavoriteTv(getSessionId(), getAccountId()); + // TODO review the generated test code and remove the default call to fail. + fail("The test case is a prototype."); + } + + /** + * Test of getRatedTV method, of class TmdbAccount. + * @throws com.omertron.themoviedbapi.MovieDbException + */ + @Test + public void testGetRatedTV() throws MovieDbException { + System.out.println("getRatedTV"); + String sessionId = ""; + int accountId = 0; + List expResult = null; + List result = instance.getRatedTV(sessionId, accountId); + assertEquals(expResult, result); + // TODO review the generated test code and remove the default call to fail. + fail("The test case is a prototype."); + } + + /** + * Test of getWatchListMovie method, of class TmdbAccount. + * @throws com.omertron.themoviedbapi.MovieDbException + */ + @Test + public void testGetWatchListMovie() throws MovieDbException { + System.out.println("getWatchListMovie"); + String sessionId = ""; + int accountId = 0; + List expResult = null; + List result = instance.getWatchListMovie(sessionId, accountId); + assertEquals(expResult, result); + // TODO review the generated test code and remove the default call to fail. + fail("The test case is a prototype."); + } + + /** + * Test of getWatchListTV method, of class TmdbAccount. + * @throws com.omertron.themoviedbapi.MovieDbException + */ + @Test + public void testGetWatchListTV() throws MovieDbException { + System.out.println("getWatchListTV"); + String sessionId = ""; + int accountId = 0; + List expResult = null; + List result = instance.getWatchListTV(sessionId, accountId); + assertEquals(expResult, result); + // TODO review the generated test code and remove the default call to fail. + fail("The test case is a prototype."); + } } diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbChangesTest.java index 4923c503d..81f0745b6 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.model.ChangedMedia; +import com.omertron.themoviedbapi.model.change.ChangedMedia; import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.tools.MethodBase; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java index 773f26d70..63a393d95 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbDiscoverTest.java @@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; -import com.omertron.themoviedbapi.model.Discover; +import com.omertron.themoviedbapi.model.discover.Discover; import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.results.TmdbResultsList; 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 bfbb2ed45..2e163fdb0 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.model.Keyword; -import com.omertron.themoviedbapi.model.KeywordMovie; +import com.omertron.themoviedbapi.model.keyword.Keyword; +import com.omertron.themoviedbapi.model.keyword.KeywordMovie; import com.omertron.themoviedbapi.results.TmdbResultsList; import org.junit.After; import org.junit.AfterClass; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java index 051bac584..d6721a145 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java @@ -23,7 +23,7 @@ import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.model.AlternativeTitle; import com.omertron.themoviedbapi.model.Artwork; -import com.omertron.themoviedbapi.model.Keyword; +import com.omertron.themoviedbapi.model.keyword.Keyword; import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.model.MovieList; import com.omertron.themoviedbapi.model.ReleaseInfo; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java index 1af36929e..deac5be78 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbPeopleTest.java @@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.methods; import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.model.Artwork; -import com.omertron.themoviedbapi.model.Person; +import com.omertron.themoviedbapi.model.person.Person; import com.omertron.themoviedbapi.results.TmdbResultsList; import org.apache.commons.lang3.StringUtils; import org.junit.After; diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java index dc331953f..e3686c69b 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbSearchTest.java @@ -23,10 +23,10 @@ import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.model.Collection; import com.omertron.themoviedbapi.model.Company; -import com.omertron.themoviedbapi.model.Keyword; +import com.omertron.themoviedbapi.model.keyword.Keyword; import com.omertron.themoviedbapi.model.MovieDb; import com.omertron.themoviedbapi.model.MovieList; -import com.omertron.themoviedbapi.model.Person; +import com.omertron.themoviedbapi.model.person.Person; import com.omertron.themoviedbapi.results.TmdbResultsList; import org.junit.AfterClass; import static org.junit.Assert.assertFalse;