Remove KeywordMovies

master
Stuart Boston 11 years ago
parent 51593fbc52
commit 24ac470ede

@ -42,10 +42,9 @@ import com.omertron.themoviedbapi.methods.TmdbPeople;
import com.omertron.themoviedbapi.methods.TmdbReviews; import com.omertron.themoviedbapi.methods.TmdbReviews;
import com.omertron.themoviedbapi.methods.TmdbSearch; import com.omertron.themoviedbapi.methods.TmdbSearch;
import com.omertron.themoviedbapi.methods.TmdbTV; import com.omertron.themoviedbapi.methods.TmdbTV;
import com.omertron.themoviedbapi.model2.Genre;
import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
import com.omertron.themoviedbapi.model2.Certification; import com.omertron.themoviedbapi.model2.Certification;
import com.omertron.themoviedbapi.model2.FindResults; import com.omertron.themoviedbapi.model2.FindResults;
import com.omertron.themoviedbapi.model2.Genre;
import com.omertron.themoviedbapi.model2.StatusCode; import com.omertron.themoviedbapi.model2.StatusCode;
import com.omertron.themoviedbapi.model2.account.Account; import com.omertron.themoviedbapi.model2.account.Account;
import com.omertron.themoviedbapi.model2.artwork.Artwork; import com.omertron.themoviedbapi.model2.artwork.Artwork;
@ -93,7 +92,8 @@ import org.yamj.api.common.http.SimpleHttpClientBuilder;
/** /**
* The MovieDb API * The MovieDb API
* <p> * <p>
* This is for version 3 of the API as specified here: http://help.themoviedb.org/kb/api/about-3 * This is for version 3 of the API as specified here:
* http://help.themoviedb.org/kb/api/about-3
* *
* @author stuart.boston * @author stuart.boston
*/ */
@ -173,7 +173,8 @@ public class TheMovieDbApi {
//<editor-fold defaultstate="collapsed" desc="Account"> //<editor-fold defaultstate="collapsed" desc="Account">
/** /**
* Get the basic information for an account. You will need to have a valid session id. * Get the basic information for an account. You will need to have a valid
* session id.
* *
* @param sessionId * @param sessionId
* @return * @return
@ -339,13 +340,16 @@ public class TheMovieDbApi {
//<editor-fold defaultstate="collapsed" desc="Authentication"> //<editor-fold defaultstate="collapsed" desc="Authentication">
/** /**
* This method is used to generate a valid request token for user based authentication. * This method is used to generate a valid request token for user based
* authentication.
* *
* A request token is required in order to request a session id. * A request token is required in order to request a session id.
* *
* You can generate any number of request tokens but they will expire after 60 minutes. * You can generate any number of request tokens but they will expire after
* 60 minutes.
* *
* As soon as a valid session id has been created the token will be destroyed. * As soon as a valid session id has been created the token will be
* destroyed.
* *
* @return * @return
* @throws MovieDbException * @throws MovieDbException
@ -355,7 +359,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method is used to generate a session id for user based authentication. * This method is used to generate a session id for user based
* authentication.
* *
* A session id is required in order to use any of the write methods. * A session id is required in order to use any of the write methods.
* *
@ -368,7 +373,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method is used to generate a session id for user based authentication. User must provide their username and password * This method is used to generate a session id for user based
* authentication. User must provide their username and password
* *
* A session id is required in order to use any of the write methods. * A session id is required in order to use any of the write methods.
* *
@ -385,14 +391,18 @@ public class TheMovieDbApi {
/** /**
* This method is used to generate a guest session id. * This method is used to generate a guest session id.
* *
* A guest session can be used to rate movies without having a registered TMDb user account. * A guest session can be used to rate movies without having a registered
* TMDb user account.
* *
* You should only generate a single guest session per user (or device) as you will be able to attach the ratings to a TMDb user * You should only generate a single guest session per user (or device) as
* account in the future. * you will be able to attach the ratings to a TMDb user account in the
* future.
* *
* There are also IP limits in place so you should always make sure it's the end user doing the guest session actions. * There are also IP limits in place so you should always make sure it's the
* end user doing the guest session actions.
* *
* If a guest session is not used for the first time within 24 hours, it will be automatically discarded. * If a guest session is not used for the first time within 24 hours, it
* will be automatically discarded.
* *
* @return * @return
* @throws MovieDbException * @throws MovieDbException
@ -428,7 +438,8 @@ public class TheMovieDbApi {
/** /**
* Get a list of Movie IDs that have been edited. * Get a list of Movie IDs that have been edited.
* *
* You can then use the movie changes API to get the actual data that has been changed. * You can then use the movie changes API to get the actual data that has
* been changed.
* *
* @param page * @param page
* @param startDate the start date of the changes, optional * @param startDate the start date of the changes, optional
@ -443,7 +454,8 @@ public class TheMovieDbApi {
/** /**
* Get a list of TV IDs that have been edited. * Get a list of TV IDs that have been edited.
* *
* You can then use the TV changes API to get the actual data that has been changed. * You can then use the TV changes API to get the actual data that has been
* changed.
* *
* @param page * @param page
* @param startDate the start date of the changes, optional * @param startDate the start date of the changes, optional
@ -458,7 +470,8 @@ public class TheMovieDbApi {
/** /**
* Get a list of Person IDs that have been edited. * Get a list of Person IDs that have been edited.
* *
* You can then use the person changes API to get the actual data that has been changed. * You can then use the person changes API to get the actual data that has
* been changed.
* *
* @param page * @param page
* @param startDate the start date of the changes, optional * @param startDate the start date of the changes, optional
@ -473,9 +486,11 @@ public class TheMovieDbApi {
//<editor-fold defaultstate="collapsed" desc="Collections"> //<editor-fold defaultstate="collapsed" desc="Collections">
/** /**
* This method is used to retrieve all of the basic information about a movie collection. * This method is used to retrieve all of the basic information about a
* movie collection.
* *
* You can get the ID needed for this method by making a getMovieInfo request for the belongs_to_collection. * You can get the ID needed for this method by making a getMovieInfo
* request for the belongs_to_collection.
* *
* @param collectionId * @param collectionId
* @param language * @param language
@ -501,7 +516,8 @@ public class TheMovieDbApi {
//<editor-fold defaultstate="collapsed" desc="Companies"> //<editor-fold defaultstate="collapsed" desc="Companies">
/** /**
* This method is used to retrieve the basic information about a production company on TMDb. * This method is used to retrieve the basic information about a production
* company on TMDb.
* *
* @param companyId * @param companyId
* @return * @return
@ -514,7 +530,8 @@ public class TheMovieDbApi {
/** /**
* This method is used to retrieve the movies associated with a company. * This method is used to retrieve the movies associated with a company.
* *
* These movies are returned in order of most recently released to oldest. The default response will return 20 movies per page. * These movies are returned in order of most recently released to oldest.
* The default response will return 20 movies per page.
* *
* @param companyId * @param companyId
* @param language * @param language
@ -561,7 +578,8 @@ public class TheMovieDbApi {
} }
/** /**
* Get the list of supported timezones for the API methods that support them. * Get the list of supported timezones for the API methods that support
* them.
* *
* @return @throws MovieDbException * @return @throws MovieDbException
*/ */
@ -576,11 +594,14 @@ public class TheMovieDbApi {
* <p> * <p>
* This is currently only supported with the new credit model found in TV. * This is currently only supported with the new credit model found in TV.
* <br/> * <br/>
* These IDs can be found from any TV credit response as well as the TV_credits and combined_credits methods for people. <br/> * These IDs can be found from any TV credit response as well as the
* The episodes object returns a list of episodes and are generally going to be guest stars. <br/> * TV_credits and combined_credits methods for people. <br/>
* The episodes object returns a list of episodes and are generally going to
* be guest stars. <br/>
* The season array will return a list of season numbers. <br/> * The season array will return a list of season numbers. <br/>
* Season credits are credits that were marked with the "add to every season" option in the editing interface and are assumed to * Season credits are credits that were marked with the "add to every
* be "season regulars". * season" option in the editing interface and are assumed to be "season
* regulars".
* *
* @param creditId * @param creditId
* @param language * @param language
@ -594,7 +615,8 @@ public class TheMovieDbApi {
//<editor-fold defaultstate="collapsed" desc="Discover"> //<editor-fold defaultstate="collapsed" desc="Discover">
/** /**
* Discover movies by different types of data like average rating, number of votes, genres and certifications. * Discover movies by different types of data like average rating, number of
* votes, genres and certifications.
* *
* @param discover A discover object containing the search criteria required * @param discover A discover object containing the search criteria required
* @return * @return
@ -605,7 +627,8 @@ public class TheMovieDbApi {
} }
/** /**
* Discover movies by different types of data like average rating, number of votes, genres and certifications. * Discover movies by different types of data like average rating, number of
* votes, genres and certifications.
* *
* @param discover A discover object containing the search criteria required * @param discover A discover object containing the search criteria required
* @return * @return
@ -618,16 +641,18 @@ public class TheMovieDbApi {
//<editor-fold defaultstate="collapsed" desc="Find"> //<editor-fold defaultstate="collapsed" desc="Find">
/** /**
* You con use this method to find movies, tv series or persons using external ids. * You con use this method to find movies, tv series or persons using
* external ids.
* *
* Supported query ids are * Supported query ids are
* <ul> * <ul>
* <li>Movies: imdb_id</li> * <li>Movies: imdb_id</li>
* <li>People: imdb_id, freebase_mid, freebase_id, tvrage_id</li> * <li>People: imdb_id, freebase_mid, freebase_id, tvrage_id</li>
* <li>TV Series: imdb_id, freebase_mid, freebase_id, tvdb_id, tvrage_id</li> * <li>TV Series: imdb_id, freebase_mid, freebase_id, tvdb_id,
* tvrage_id</li>
* <li>TV Seasons: freebase_mid, freebase_id, tvdb_id, tvrage_id</li> * <li>TV Seasons: freebase_mid, freebase_id, tvdb_id, tvrage_id</li>
* <li>TV Episodes: imdb_id, freebase_mid, freebase_id, tvdb_id, tvrage_idimdb_id, freebase_mid, freebase_id, tvrage_id, * <li>TV Episodes: imdb_id, freebase_mid, freebase_id, tvdb_id,
* tvdb_id. * tvrage_idimdb_id, freebase_mid, freebase_id, tvrage_id, tvdb_id.
* </ul> * </ul>
* *
* For details see http://docs.themoviedb.apiary.io/#find * For details see http://docs.themoviedb.apiary.io/#find
@ -669,9 +694,11 @@ public class TheMovieDbApi {
/** /**
* Get a list of movies per genre. * Get a list of movies per genre.
* *
* It is important to understand that only movies with more than 10 votes get listed. * It is important to understand that only movies with more than 10 votes
* get listed.
* *
* This prevents movies from 1 10/10 rating from being listed first and for the first 5 pages. * This prevents movies from 1 10/10 rating from being listed first and for
* the first 5 pages.
* *
* @param genreId * @param genreId
* @param language * @param language
@ -707,7 +734,7 @@ public class TheMovieDbApi {
* @return List of movies with the keyword * @return List of movies with the keyword
* @throws MovieDbException * @throws MovieDbException
*/ */
public TmdbResultsList<KeywordMovie> getKeywordMovies(String keywordId, String language, Integer page) throws MovieDbException { public TmdbResultsList<MovieBasic> getKeywordMovies(String keywordId, String language, Integer page) throws MovieDbException {
return tmdbKeywords.getKeywordMovies(keywordId, language, page); return tmdbKeywords.getKeywordMovies(keywordId, language, page);
} }
//</editor-fold> //</editor-fold>
@ -738,7 +765,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method lets users delete a list that they created. A valid session id is required. * This method lets users delete a list that they created. A valid session
* id is required.
* *
* @param sessionId * @param sessionId
* @param listId * @param listId
@ -798,7 +826,8 @@ public class TheMovieDbApi {
* *
* It will return the single highest rated poster and backdrop. * It will return the single highest rated poster and backdrop.
* *
* ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies found. * ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies
* found.
* *
* @param movieId * @param movieId
* @param language * @param language
@ -815,7 +844,8 @@ public class TheMovieDbApi {
* *
* It will return the single highest rated poster and backdrop. * It will return the single highest rated poster and backdrop.
* *
* ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies found. * ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies
* found.
* *
* @param imdbId * @param imdbId
* @param language * @param language
@ -828,8 +858,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method lets a user get the status of whether or not the movie has been rated or added to their favourite or movie watch * This method lets a user get the status of whether or not the movie has
* list. * been rated or added to their favourite or movie watch list.
* *
* A valid session id is required. * A valid session id is required.
* *
@ -843,7 +873,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method is used to retrieve all of the alternative titles we have for a particular movie. * This method is used to retrieve all of the alternative titles we have for
* a particular movie.
* *
* @param movieId * @param movieId
* @param country * @param country
@ -868,7 +899,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method should be used when youre wanting to retrieve all of the images for a particular movie. * This method should be used when youre wanting to retrieve all of the
* images for a particular movie.
* *
* @param movieId * @param movieId
* @param language * @param language
@ -881,7 +913,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method is used to retrieve all of the keywords that have been added to a particular movie. * This method is used to retrieve all of the keywords that have been added
* to a particular movie.
* *
* Currently, only English keywords exist. * Currently, only English keywords exist.
* *
@ -895,7 +928,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method is used to retrieve all of the release and certification data we have for a specific movie. * This method is used to retrieve all of the release and certification data
* we have for a specific movie.
* *
* @param movieId * @param movieId
* @param language * @param language
@ -908,7 +942,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method is used to retrieve all of the trailers for a particular movie. * This method is used to retrieve all of the trailers for a particular
* movie.
* *
* Supported sites are YouTube and QuickTime. * Supported sites are YouTube and QuickTime.
* *
@ -923,7 +958,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method is used to retrieve a list of the available translations for a specific movie. * This method is used to retrieve a list of the available translations for
* a specific movie.
* *
* @param movieId * @param movieId
* @param appendToResponse * @param appendToResponse
@ -935,9 +971,11 @@ public class TheMovieDbApi {
} }
/** /**
* The similar movies method will let you retrieve the similar movies for a particular movie. * The similar movies method will let you retrieve the similar movies for a
* particular movie.
* *
* This data is created dynamically but with the help of users votes on TMDb. * This data is created dynamically but with the help of users votes on
* TMDb.
* *
* The data is much better with movies that have more keywords * The data is much better with movies that have more keywords
* *
@ -987,7 +1025,8 @@ public class TheMovieDbApi {
* *
* By default, only the last 24 hours of changes are returned. * By default, only the last 24 hours of changes are returned.
* *
* The maximum number of days that can be returned in a single request is 14. * The maximum number of days that can be returned in a single request is
* 14.
* *
* The language is present on fields that are translatable. * The language is present on fields that are translatable.
* *
@ -1046,7 +1085,8 @@ public class TheMovieDbApi {
/** /**
* This method is used to retrieve the movies currently in theatres. * This method is used to retrieve the movies currently in theatres.
* *
* This is a curated list that will normally contain 100 movies. The default response will return 20 movies. * This is a curated list that will normally contain 100 movies. The default
* response will return 20 movies.
* *
* @param language * @param language
* @param page * @param page
@ -1072,7 +1112,8 @@ public class TheMovieDbApi {
} }
/** /**
* This method is used to retrieve the top rated movies that have over 10 votes on TMDb. * This method is used to retrieve the top rated movies that have over 10
* votes on TMDb.
* *
* The default response will return 20 movies. * The default response will return 20 movies.
* *
@ -1130,9 +1171,11 @@ public class TheMovieDbApi {
/** /**
* Get the TV credits for a specific person id. * Get the TV credits for a specific person id.
* *
* To get the expanded details for each record, call the /credit method with the provided credit_id. * To get the expanded details for each record, call the /credit method with
* the provided credit_id.
* *
* This will provide details about which episode and/or season the credit is for. * This will provide details about which episode and/or season the credit is
* for.
* *
* @param personId * @param personId
* @param language * @param language
@ -1147,9 +1190,11 @@ public class TheMovieDbApi {
/** /**
* Get the combined (movie and TV) credits for a specific person id. * Get the combined (movie and TV) credits for a specific person id.
* *
* To get the expanded details for each TV record, call the /credit method with the provided credit_id. * To get the expanded details for each TV record, call the /credit method
* with the provided credit_id.
* *
* This will provide details about which episode and/or season the credit is for. * This will provide details about which episode and/or season the credit is
* for.
* *
* @param personId * @param personId
* @param language * @param language
@ -1186,7 +1231,8 @@ public class TheMovieDbApi {
/** /**
* Get the images that have been tagged with a specific person id. * Get the images that have been tagged with a specific person id.
* *
* We return all of the image results with a media object mapped for each image. * We return all of the image results with a media object mapped for each
* image.
* *
* @param personId * @param personId
* @param page * @param page
@ -1205,7 +1251,8 @@ public class TheMovieDbApi {
* *
* By default, only the last 24 hours of changes are returned. * By default, only the last 24 hours of changes are returned.
* *
* The maximum number of days that can be returned in a single request is 14. * The maximum number of days that can be returned in a single request is
* 14.
* *
* The language is present on fields that are translatable. * The language is present on fields that are translatable.
* *
@ -1258,8 +1305,8 @@ public class TheMovieDbApi {
/** /**
* Search Companies. * Search Companies.
* *
* You can use this method to search for production companies that are part of TMDb. The company IDs will map to those returned * You can use this method to search for production companies that are part
* on movie calls. * of TMDb. The company IDs will map to those returned on movie calls.
* *
* http://help.themoviedb.org/kb/api/search-companies * http://help.themoviedb.org/kb/api/search-companies
* *
@ -1311,13 +1358,16 @@ public class TheMovieDbApi {
} }
/** /**
* Search Movies This is a good starting point to start finding movies on TMDb. * Search Movies This is a good starting point to start finding movies on
* TMDb.
* *
* @param query * @param query
* @param searchYear Limit the search to the provided year. Zero (0) will get all years * @param searchYear Limit the search to the provided year. Zero (0) will
* get all years
* @param language The language to include. Can be blank/null. * @param language The language to include. Can be blank/null.
* @param includeAdult true or false to include adult titles in the search * @param includeAdult true or false to include adult titles in the search
* @param page The page of results to return. 0 to get the default (first page) * @param page The page of results to return. 0 to get the default (first
* page)
* @param primaryReleaseYear * @param primaryReleaseYear
* @param searchType * @param searchType
* @return * @return
@ -1336,9 +1386,11 @@ public class TheMovieDbApi {
/** /**
* Search the movie, tv show and person collections with a single query. * Search the movie, tv show and person collections with a single query.
* *
* Each item returned in the result array has a media_type field that maps to either movie, tv or person. * Each item returned in the result array has a media_type field that maps
* to either movie, tv or person.
* *
* Each mapped result is the same response you would get from each independent search * Each mapped result is the same response you would get from each
* independent search
* *
* @param query * @param query
* @param page * @param page
@ -1354,7 +1406,8 @@ public class TheMovieDbApi {
/** /**
* This is a good starting point to start finding people on TMDb. * This is a good starting point to start finding people on TMDb.
* *
* The idea is to be a quick and light method so you can iterate through people quickly. * The idea is to be a quick and light method so you can iterate through
* people quickly.
* *
* @param query * @param query
* @param includeAdult * @param includeAdult

@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods;
import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.MovieDbException;
import com.omertron.themoviedbapi.model2.keyword.Keyword; import com.omertron.themoviedbapi.model2.keyword.Keyword;
import com.omertron.themoviedbapi.model.keyword.KeywordMovie; import com.omertron.themoviedbapi.model2.movie.MovieBasic;
import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.results.TmdbResultsList;
import com.omertron.themoviedbapi.tools.ApiUrl; import com.omertron.themoviedbapi.tools.ApiUrl;
import com.omertron.themoviedbapi.tools.HttpTools; import com.omertron.themoviedbapi.tools.HttpTools;
@ -29,7 +29,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
import com.omertron.themoviedbapi.tools.MethodSub; import com.omertron.themoviedbapi.tools.MethodSub;
import com.omertron.themoviedbapi.tools.Param; import com.omertron.themoviedbapi.tools.Param;
import com.omertron.themoviedbapi.tools.TmdbParameters; import com.omertron.themoviedbapi.tools.TmdbParameters;
import com.omertron.themoviedbapi.wrapper.WrapperKeywordMovies; import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import org.yamj.api.common.exception.ApiExceptionType; import org.yamj.api.common.exception.ApiExceptionType;
@ -82,23 +82,30 @@ public class TmdbKeywords extends AbstractMethod {
* @return List of movies with the keyword * @return List of movies with the keyword
* @throws MovieDbException * @throws MovieDbException
*/ */
public TmdbResultsList<KeywordMovie> getKeywordMovies(String keywordId, String language, int page) throws MovieDbException { public TmdbResultsList<MovieBasic> getKeywordMovies(String keywordId, String language, Integer page) throws MovieDbException {
TmdbParameters parameters = new TmdbParameters(); TmdbParameters parameters = new TmdbParameters();
parameters.add(Param.ID, keywordId); parameters.add(Param.ID, keywordId);
parameters.add(Param.LANGUAGE, language); parameters.add(Param.LANGUAGE, language);
parameters.add(Param.PAGE, page); parameters.add(Param.PAGE, page);
URL url = new ApiUrl(apiKey, MethodBase.KEYWORD).subMethod(MethodSub.MOVIES).buildUrl(parameters); URL url = new ApiUrl(apiKey, MethodBase.KEYWORD).subMethod(MethodSub.MOVIES).buildUrl(parameters);
String webpage = httpTools.getRequest(url); WrapperGenericList<MovieBasic> wrapper = processWrapper(getTypeReference(MovieBasic.class), url, "keyword movies");
TmdbResultsList<MovieBasic> results = new TmdbResultsList<MovieBasic>(wrapper.getResults());
try {
WrapperKeywordMovies wrapper = MAPPER.readValue(webpage, WrapperKeywordMovies.class);
TmdbResultsList<KeywordMovie> results = new TmdbResultsList<KeywordMovie>(wrapper.getResults());
results.copyWrapper(wrapper); results.copyWrapper(wrapper);
return results; return results;
} catch (IOException ex) {
throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get keyword movies", url, ex);
}
// String webpage = httpTools.getRequest(url);
//
// try {
// WrapperKeywordMovies wrapper = MAPPER.readValue(webpage, WrapperKeywordMovies.class);
// TmdbResultsList<KeywordMovie> results = new TmdbResultsList<KeywordMovie>(wrapper.getResults());
// results.copyWrapper(wrapper);
// return results;
// } catch (IOException ex) {
// throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to get keyword movies", url, ex);
// }
} }
} }

@ -1,149 +0,0 @@
/*
* Copyright (c) 2004-2015 Stuart Boston
*
* This file is part of TheMovieDB API.
*
* TheMovieDB API is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* TheMovieDB API is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with TheMovieDB API. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.omertron.themoviedbapi.model.keyword;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
/**
* @author Stuart
*/
public class KeywordMovie extends AbstractJsonMapping {
private static final long serialVersionUID = 1L;
/*
* Properties
*/
@JsonProperty("id")
private String id;
@JsonProperty("backdrop_path")
private String backdropPath;
@JsonProperty("original_title")
private String originalTitle;
@JsonProperty("release_date")
private String releaseDate;
@JsonProperty("poster_path")
private String posterPath;
@JsonProperty("title")
private String title;
@JsonProperty("vote_average")
private float voteAverage;
@JsonProperty("vote_count")
private double voteCount;
@JsonProperty("adult")
private boolean adult;
@JsonProperty("popularity")
private float popularity;
@JsonProperty("video")
private boolean video;
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getBackdropPath() {
return backdropPath;
}
public String getId() {
return id;
}
public String getOriginalTitle() {
return originalTitle;
}
public String getReleaseDate() {
return releaseDate;
}
public String getPosterPath() {
return posterPath;
}
public String getTitle() {
return title;
}
public float getVoteAverage() {
return voteAverage;
}
public double getVoteCount() {
return voteCount;
}
public boolean isAdult() {
return adult;
}
public float getPopularity() {
return popularity;
}
public boolean isVideo() {
return video;
}
public void setBackdropPath(String backdropPath) {
this.backdropPath = backdropPath;
}
public void setId(String id) {
this.id = id;
}
public void setOriginalTitle(String originalTitle) {
this.originalTitle = originalTitle;
}
public void setReleaseDate(String releaseDate) {
this.releaseDate = releaseDate;
}
public void setPosterPath(String posterPath) {
this.posterPath = posterPath;
}
public void setTitle(String title) {
this.title = title;
}
public void setVoteAverage(float voteAverage) {
this.voteAverage = voteAverage;
}
public void setVoteCount(double voteCount) {
this.voteCount = voteCount;
}
public void setAdult(boolean adult) {
this.adult = adult;
}
public void setPopularity(float popularity) {
this.popularity = popularity;
}
public void setVideo(boolean video) {
this.video = video;
}
}

@ -1,42 +0,0 @@
/*
* Copyright (c) 2004-2015 Stuart Boston
*
* This file is part of TheMovieDB API.
*
* TheMovieDB API is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* TheMovieDB API is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with TheMovieDB API. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.omertron.themoviedbapi.wrapper;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
import java.util.List;
/**
*
* @author stuart.boston
*/
public class WrapperKeywordMovies extends AbstractWrapperAll {
@JsonProperty("results")
private List<KeywordMovie> results;
public List<KeywordMovie> getResults() {
return results;
}
public void setResults(List<KeywordMovie> results) {
this.results = results;
}
}

@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.methods;
import com.omertron.themoviedbapi.AbstractTests; import com.omertron.themoviedbapi.AbstractTests;
import com.omertron.themoviedbapi.MovieDbException; import com.omertron.themoviedbapi.MovieDbException;
import com.omertron.themoviedbapi.model2.keyword.Keyword; import com.omertron.themoviedbapi.model2.keyword.Keyword;
import com.omertron.themoviedbapi.model.keyword.KeywordMovie; import com.omertron.themoviedbapi.model2.movie.MovieBasic;
import com.omertron.themoviedbapi.results.TmdbResultsList; import com.omertron.themoviedbapi.results.TmdbResultsList;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
@ -83,7 +83,7 @@ public class TmdbKeywordsTest extends AbstractTests{
public void testGetKeywordMovies() throws MovieDbException { public void testGetKeywordMovies() throws MovieDbException {
LOG.info("getKeywordMovies"); LOG.info("getKeywordMovies");
int page = 0; int page = 0;
TmdbResultsList<KeywordMovie> result = tmdb.getKeywordMovies(ID_KEYWORD, LANGUAGE_DEFAULT, page); TmdbResultsList<MovieBasic> result = tmdb.getKeywordMovies(ID_KEYWORD, LANGUAGE_DEFAULT, page);
assertFalse("No keyword movies found", result.isEmpty()); assertFalse("No keyword movies found", result.isEmpty());
} }

Loading…
Cancel
Save