birkeh/api-themoviedb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed showVersion method (not working with git)

Browse Source 
Normalised logger naming
This commit is contained in:
Omertron
2012-11-24 09:03:18 +00:00
parent e5e6b1d08e
commit 52d8d35ed8
40 changed files with 146 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
+32 -51
View File
@@ -65,7 +65,7 @@ import org.apache.log4j.Logger;
*/
public class TheMovieDbApi {
private static final Logger LOGGER = Logger.getLogger(TheMovieDbApi.class);
private static final Logger logger = Logger.getLogger(TheMovieDbApi.class);
private String apiKey;
private TmdbConfiguration tmdbConfig;
/*
@@ -119,25 +119,6 @@ public class TheMovieDbApi {
}
}
/**
* Output the API version information to the debug log
*/
public static void showVersion() {
String apiTitle = TheMovieDbApi.class.getPackage().getSpecificationTitle();
if (StringUtils.isNotBlank(apiTitle)) {
String apiVersion = TheMovieDbApi.class.getPackage().getSpecificationVersion();
String apiRevision = TheMovieDbApi.class.getPackage().getImplementationVersion();
StringBuilder sv = new StringBuilder();
sv.append(apiTitle).append(" ");
sv.append(apiVersion).append(" r");
sv.append(apiRevision);
LOGGER.debug(sv.toString());
} else {
LOGGER.debug("API-TheMovieDb version/revision information not available");
}
}
/**
* Get the API key that is to be used
*
@@ -251,7 +232,7 @@ public class TheMovieDbApi {
try {
return (new URL(sb.toString()));
} catch (MalformedURLException ex) {
LOGGER.warn("Failed to create image URL: " + ex.getMessage());
logger.warn("Failed to create image URL: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.INVALID_URL, sb.toString(), ex);
}
}
@@ -280,7 +261,7 @@ public class TheMovieDbApi {
try {
return mapper.readValue(webpage, TokenAuthorisation.class);
} catch (IOException ex) {
LOGGER.warn("Failed to get Authorisation Token: " + ex.getMessage());
logger.warn("Failed to get Authorisation Token: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.AUTHORISATION_FAILURE, webpage, ex);
}
}
@@ -298,7 +279,7 @@ public class TheMovieDbApi {
ApiUrl apiUrl = new ApiUrl(this, BASE_AUTH, "session/new");
if (!token.getSuccess()) {
LOGGER.warn("Authorisation token was not successful!");
logger.warn("Authorisation token was not successful!");
throw new MovieDbException(MovieDbExceptionType.AUTHORISATION_FAILURE, "Authorisation token was not successful!");
}
@@ -309,7 +290,7 @@ public class TheMovieDbApi {
try {
return mapper.readValue(webpage, TokenSession.class);
} catch (IOException ex) {
LOGGER.warn("Failed to get Session Token: " + ex.getMessage());
logger.warn("Failed to get Session Token: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -344,7 +325,7 @@ public class TheMovieDbApi {
try {
return mapper.readValue(webpage, MovieDb.class);
} catch (IOException ex) {
LOGGER.warn("Failed to get movie info: " + ex.getMessage());
logger.warn("Failed to get movie info: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -373,7 +354,7 @@ public class TheMovieDbApi {
try {
return mapper.readValue(webpage, MovieDb.class);
} catch (IOException ex) {
LOGGER.warn("Failed to get movie info: " + ex.getMessage());
logger.warn("Failed to get movie info: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -400,7 +381,7 @@ public class TheMovieDbApi {
WrapperAlternativeTitles wrapper = mapper.readValue(webpage, WrapperAlternativeTitles.class);
return wrapper.getTitles();
} catch (IOException ex) {
LOGGER.warn("Failed to get movie alternative titles: " + ex.getMessage());
logger.warn("Failed to get movie alternative titles: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -441,7 +422,7 @@ public class TheMovieDbApi {
return people;
} catch (IOException ex) {
LOGGER.warn("Failed to get movie casts: " + ex.getMessage());
logger.warn("Failed to get movie casts: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -482,7 +463,7 @@ public class TheMovieDbApi {
return artwork;
} catch (IOException ex) {
LOGGER.warn("Failed to get movie images: " + ex.getMessage());
logger.warn("Failed to get movie images: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -507,7 +488,7 @@ public class TheMovieDbApi {
WrapperMovieKeywords wrapper = mapper.readValue(webpage, WrapperMovieKeywords.class);
return wrapper.getKeywords();
} catch (IOException ex) {
LOGGER.warn("Failed to get movie keywords: " + ex.getMessage());
logger.warn("Failed to get movie keywords: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -532,7 +513,7 @@ public class TheMovieDbApi {
WrapperReleaseInfo wrapper = mapper.readValue(webpage, WrapperReleaseInfo.class);
return wrapper.getCountries();
} catch (IOException ex) {
LOGGER.warn("Failed to get movie release information: " + ex.getMessage());
logger.warn("Failed to get movie release information: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -575,7 +556,7 @@ public class TheMovieDbApi {
}
return trailers;
} catch (IOException ex) {
LOGGER.warn("Failed to get movie trailers: " + ex.getMessage());
logger.warn("Failed to get movie trailers: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -598,7 +579,7 @@ public class TheMovieDbApi {
WrapperTranslations wrapper = mapper.readValue(webpage, WrapperTranslations.class);
return wrapper.getTranslations();
} catch (IOException ex) {
LOGGER.warn("Failed to get movie tranlations: " + ex.getMessage());
logger.warn("Failed to get movie tranlations: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -635,7 +616,7 @@ public class TheMovieDbApi {
WrapperMovie wrapper = mapper.readValue(webpage, WrapperMovie.class);
return wrapper.getMovies();
} catch (IOException ex) {
LOGGER.warn("Failed to get similar movies: " + ex.getMessage());
logger.warn("Failed to get similar movies: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -653,7 +634,7 @@ public class TheMovieDbApi {
try {
return mapper.readValue(webpage, MovieDb.class);
} catch (IOException ex) {
LOGGER.warn("Failed to get latest movie: " + ex.getMessage());
logger.warn("Failed to get latest movie: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -686,7 +667,7 @@ public class TheMovieDbApi {
WrapperMovie wrapper = mapper.readValue(webpage, WrapperMovie.class);
return wrapper.getMovies();
} catch (IOException ex) {
LOGGER.warn("Failed to get upcoming movies: " + ex.getMessage());
logger.warn("Failed to get upcoming movies: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
@@ -722,7 +703,7 @@ public class TheMovieDbApi {
WrapperMovie wrapper = mapper.readValue(webpage, WrapperMovie.class);
return wrapper.getMovies();
} catch (IOException ex) {
LOGGER.warn("Failed to get now playing movies: " + ex.getMessage());
logger.warn("Failed to get now playing movies: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -757,7 +738,7 @@ public class TheMovieDbApi {
WrapperMovie wrapper = mapper.readValue(webpage, WrapperMovie.class);
return wrapper.getMovies();
} catch (IOException ex) {
LOGGER.warn("Failed to get popular movie list: " + ex.getMessage());
logger.warn("Failed to get popular movie list: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -792,7 +773,7 @@ public class TheMovieDbApi {
WrapperMovie wrapper = mapper.readValue(webpage, WrapperMovie.class);
return wrapper.getMovies();
} catch (IOException ex) {
LOGGER.warn("Failed to get top rated movies: " + ex.getMessage());
logger.warn("Failed to get top rated movies: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -843,7 +824,7 @@ public class TheMovieDbApi {
try {
return mapper.readValue(webpage, CollectionInfo.class);
} catch (IOException ex) {
LOGGER.warn("Failed to get collection information: " + ex.getMessage());
logger.warn("Failed to get collection information: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -885,7 +866,7 @@ public class TheMovieDbApi {
return artwork;
} catch (IOException ex) {
LOGGER.warn("Failed to get collection images: " + ex.getMessage());
logger.warn("Failed to get collection images: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
@@ -914,7 +895,7 @@ public class TheMovieDbApi {
try {
return mapper.readValue(webpage, Person.class);
} catch (IOException ex) {
LOGGER.warn("Failed to get movie info: " + ex.getMessage());
logger.warn("Failed to get movie info: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -953,7 +934,7 @@ public class TheMovieDbApi {
}
return personCredits;
} catch (IOException ex) {
LOGGER.warn("Failed to get person credits: " + ex.getMessage());
logger.warn("Failed to get person credits: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -985,7 +966,7 @@ public class TheMovieDbApi {
}
return personImages;
} catch (IOException ex) {
LOGGER.warn("Failed to get person images: " + ex.getMessage());
logger.warn("Failed to get person images: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -1011,7 +992,7 @@ public class TheMovieDbApi {
try {
return mapper.readValue(webpage, Company.class);
} catch (IOException ex) {
LOGGER.warn("Failed to get company information: " + ex.getMessage());
logger.warn("Failed to get company information: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -1050,7 +1031,7 @@ public class TheMovieDbApi {
WrapperCompanyMovies wrapper = mapper.readValue(webpage, WrapperCompanyMovies.class);
return wrapper.getResults();
} catch (IOException ex) {
LOGGER.warn("Failed to get company movies: " + ex.getMessage());
logger.warn("Failed to get company movies: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -1077,7 +1058,7 @@ public class TheMovieDbApi {
WrapperGenres wrapper = mapper.readValue(webpage, WrapperGenres.class);
return wrapper.getGenres();
} catch (IOException ex) {
LOGGER.warn("Failed to get genre list: " + ex.getMessage());
logger.warn("Failed to get genre list: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -1113,7 +1094,7 @@ public class TheMovieDbApi {
WrapperMovie wrapper = mapper.readValue(webpage, WrapperMovie.class);
return wrapper.getMovies();
} catch (IOException ex) {
LOGGER.warn("Failed to get genre movie list: " + ex.getMessage());
logger.warn("Failed to get genre movie list: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -1159,7 +1140,7 @@ public class TheMovieDbApi {
WrapperMovie wrapper = mapper.readValue(webpage, WrapperMovie.class);
return wrapper.getMovies();
} catch (IOException ex) {
LOGGER.warn("Failed to find movie: " + ex.getMessage());
logger.warn("Failed to find movie: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
@@ -1192,7 +1173,7 @@ public class TheMovieDbApi {
WrapperCompany wrapper = mapper.readValue(webpage, WrapperCompany.class);
return wrapper.getResults();
} catch (IOException ex) {
LOGGER.warn("Failed to find company: " + ex.getMessage());
logger.warn("Failed to find company: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
@@ -1225,7 +1206,7 @@ public class TheMovieDbApi {
WrapperPerson wrapper = mapper.readValue(webpage, WrapperPerson.class);
return wrapper.getResults();
} catch (IOException ex) {
LOGGER.warn("Failed to find person: " + ex.getMessage());
logger.warn("Failed to find person: " + ex.getMessage());
throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
}
}
src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class AlternativeTitle implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(AlternativeTitle.class);
private static final Logger logger = Logger.getLogger(AlternativeTitle.class);
/*
* Properties
*/
@@ -65,7 +65,7 @@ public class AlternativeTitle implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/Artwork.java
+2 -2
View File
@@ -26,7 +26,7 @@ public class Artwork implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(Artwork.class);
private static final Logger logger = Logger.getLogger(Artwork.class);
/*
* Properties
*/
@@ -125,7 +125,7 @@ public class Artwork implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/Collection.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class Collection implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(Collection.class);
private static final Logger logger = Logger.getLogger(Collection.class);
/*
* Properties
*/
@@ -113,7 +113,7 @@ public class Collection implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java
+2 -2
View File
@@ -26,7 +26,7 @@ public class CollectionInfo implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(CollectionInfo.class);
private static final Logger logger = Logger.getLogger(CollectionInfo.class);
/*
* Properties
*/
@@ -96,7 +96,7 @@ public class CollectionInfo implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/Company.java
+2 -2
View File
@@ -23,7 +23,7 @@ public class Company implements Serializable {
private static final long serialVersionUID = 1L;
// Logger
private static final Logger LOGGER = Logger.getLogger(Company.class);
private static final Logger logger = Logger.getLogger(Company.class);
private static final String DEFAULT_STRING = "";
// Properties
@JsonProperty("id")
@@ -112,7 +112,7 @@ public class Company implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/Genre.java
+2 -2
View File
@@ -26,7 +26,7 @@ public class Genre implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(Genre.class);
private static final Logger logger = Logger.getLogger(Genre.class);
/*
* Properties
*/
@@ -66,7 +66,7 @@ public class Genre implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/Keyword.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class Keyword implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(Keyword.class);
private static final Logger logger = Logger.getLogger(Keyword.class);
/*
* Properties
*/
@@ -67,7 +67,7 @@ public class Keyword implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/Language.java
+2 -2
View File
@@ -26,7 +26,7 @@ public class Language implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(Language.class);
private static final Logger logger = Logger.getLogger(Language.class);
/*
* Properties
*/
@@ -66,7 +66,7 @@ public class Language implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/MovieDb.java
+2 -2
View File
@@ -26,7 +26,7 @@ public class MovieDb implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(MovieDb.class);
private static final Logger logger = Logger.getLogger(MovieDb.class);
/*
* Properties
*/
@@ -277,7 +277,7 @@ public class MovieDb implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
//<editor-fold defaultstate="collapsed" desc="Equals and HashCode">
src/main/java/com/omertron/themoviedbapi/model/Person.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class Person implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(Person.class);
private static final Logger logger = Logger.getLogger(Person.class);
/*
* Static fields for default cast information
@@ -239,7 +239,7 @@ public class Person implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/PersonCast.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class PersonCast implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(PersonCast.class);
private static final Logger logger = Logger.getLogger(PersonCast.class);
/*
* Properties
*/
@@ -107,7 +107,7 @@ public class PersonCast implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class PersonCredit implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(PersonCredit.class);
private static final Logger logger = Logger.getLogger(PersonCredit.class);
private static final String DEFAULT_STRING = "";
/*
* Properties
@@ -145,7 +145,7 @@ public class PersonCredit implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class PersonCrew implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(PersonCrew.class);
private static final Logger logger = Logger.getLogger(PersonCrew.class);
/*
* Properties
*/
@@ -95,7 +95,7 @@ public class PersonCrew implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class ProductionCompany implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(ProductionCompany.class);
private static final Logger logger = Logger.getLogger(ProductionCompany.class);
/*
* Properties
*/
@@ -67,7 +67,7 @@ public class ProductionCompany implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class ProductionCountry implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(ProductionCountry.class);
private static final Logger logger = Logger.getLogger(ProductionCountry.class);
/*
* Properties
*/
@@ -67,7 +67,7 @@ public class ProductionCountry implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class ReleaseInfo implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(ReleaseInfo.class);
private static final Logger logger = Logger.getLogger(ReleaseInfo.class);
/*
* Properties
*/
@@ -75,7 +75,7 @@ public class ReleaseInfo implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/StatusCode.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class StatusCode implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(StatusCode.class);
private static final Logger logger = Logger.getLogger(StatusCode.class);
/*
* Properties
*/
@@ -65,7 +65,7 @@ public class StatusCode implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java
+2 -2
View File
@@ -26,7 +26,7 @@ public class TmdbConfiguration implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(TmdbConfiguration.class);
private static final Logger logger = Logger.getLogger(TmdbConfiguration.class);
/*
* Properties
*/
@@ -174,7 +174,7 @@ public class TmdbConfiguration implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
+2 -2
View File
@@ -17,7 +17,7 @@ public class TokenAuthorisation {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(TokenAuthorisation.class);
private static final Logger logger = Logger.getLogger(TokenAuthorisation.class);
/*
* Properties
*/
@@ -67,7 +67,7 @@ public class TokenAuthorisation {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
+2 -2
View File
@@ -17,7 +17,7 @@ public class TokenSession {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(TokenSession.class);
private static final Logger logger = Logger.getLogger(TokenSession.class);
/*
* Properties
*/
@@ -77,7 +77,7 @@ public class TokenSession {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/Trailer.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class Trailer implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(Trailer.class);
private static final Logger logger = Logger.getLogger(Trailer.class);
/*
* Website sources
*/
@@ -85,7 +85,7 @@ public class Trailer implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/model/Translation.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class Translation implements Serializable {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(Translation.class);
private static final Logger logger = Logger.getLogger(Translation.class);
/*
* Properties
*/
@@ -75,7 +75,7 @@ public class Translation implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java
+4 -4
View File
@@ -28,7 +28,7 @@ public class ApiUrl {
/*
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(ApiUrl.class);
private static final Logger logger = Logger.getLogger(ApiUrl.class);
/*
* TheMovieDbApi API Base URL
*/
@@ -119,7 +119,7 @@ public class ApiUrl {
try {
urlString.append(URLEncoder.encode(query, "UTF-8"));
} catch (UnsupportedEncodingException ex) {
LOGGER.trace("Unable to encode query: '" + query + "' trying raw.");
logger.trace("Unable to encode query: '" + query + "' trying raw.");
// If we can't encode it, try it raw
urlString.append(query);
}
@@ -146,10 +146,10 @@ public class ApiUrl {
}
try {
LOGGER.trace("URL: " + urlString.toString());
logger.trace("URL: " + urlString.toString());
return new URL(urlString.toString());
} catch (MalformedURLException ex) {
LOGGER.warn("Failed to create URL " + urlString.toString() + " - " + ex.toString());
logger.warn("Failed to create URL " + urlString.toString() + " - " + ex.toString());
return null;
} finally {
arguments.clear();
src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java
+2 -2
View File
@@ -33,7 +33,7 @@ import org.apache.log4j.Logger;
*/
public final class WebBrowser {
private static final Logger LOGGER = Logger.getLogger(WebBrowser.class);
private static final Logger logger = Logger.getLogger(WebBrowser.class);
private static Map<String, String> browserProperties = new HashMap<String, String>();
private static Map<String, Map<String, String>> cookies = new HashMap<String, Map<String, String>>();
private static String proxyHost = null;
@@ -123,7 +123,7 @@ public final class WebBrowser {
try {
content.close();
} catch (IOException ex) {
LOGGER.debug("Failed to close connection: " + ex.getMessage());
logger.debug("Failed to close connection: " + ex.getMessage());
}
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperAlternativeTitles {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperAlternativeTitles.class);
private static final Logger logger = Logger.getLogger(WrapperAlternativeTitles.class);
/*
* Properties
*/
@@ -59,6 +59,6 @@ public class WrapperAlternativeTitles {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperCompany {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperCompany.class);
private static final Logger logger = Logger.getLogger(WrapperCompany.class);
/*
* Properties
*/
@@ -83,6 +83,6 @@ public class WrapperCompany {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java
+2 -2
View File
@@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
*/
public class WrapperCompanyMovies {
// Loggers
private static final Logger LOGGER = Logger.getLogger(WrapperCompanyMovies.class);
private static final Logger logger = Logger.getLogger(WrapperCompanyMovies.class);
/*
* Properties
*/
@@ -90,7 +90,7 @@ public class WrapperCompanyMovies {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java
+2 -2
View File
@@ -23,7 +23,7 @@ public class WrapperConfig {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperConfig.class);
private static final Logger logger = Logger.getLogger(WrapperConfig.class);
/*
* Properties
*/
@@ -48,7 +48,7 @@ public class WrapperConfig {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class WrapperGenres {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperGenres.class);
private static final Logger logger = Logger.getLogger(WrapperGenres.class);
/*
* Properties
*/
@@ -51,6 +51,6 @@ public class WrapperGenres {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperImages {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperImages.class);
private static final Logger logger = Logger.getLogger(WrapperImages.class);
/*
* Properties
*/
@@ -84,6 +84,6 @@ public class WrapperImages {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperMovie {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperMovie.class);
private static final Logger logger = Logger.getLogger(WrapperMovie.class);
/*
* Properties
*/
@@ -94,7 +94,7 @@ public class WrapperMovie {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
@Override
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class WrapperMovieCasts {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperMovieCasts.class);
private static final Logger logger = Logger.getLogger(WrapperMovieCasts.class);
/*
* Properties
*/
@@ -74,6 +74,6 @@ public class WrapperMovieCasts {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperMovieKeywords {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperMovieKeywords.class);
private static final Logger logger = Logger.getLogger(WrapperMovieKeywords.class);
/*
* Properties
*/
@@ -63,6 +63,6 @@ public class WrapperMovieKeywords {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperPerson {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperPerson.class);
private static final Logger logger = Logger.getLogger(WrapperPerson.class);
/*
* Properties
*/
@@ -83,6 +83,6 @@ public class WrapperPerson {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperPersonCredits {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperMovieCasts.class);
private static final Logger logger = Logger.getLogger(WrapperMovieCasts.class);
/*
* Properties
*/
@@ -73,6 +73,6 @@ public class WrapperPersonCredits {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperReleaseInfo {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperReleaseInfo.class);
private static final Logger logger = Logger.getLogger(WrapperReleaseInfo.class);
/*
* Properties
*/
@@ -63,6 +63,6 @@ public class WrapperReleaseInfo {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTrailers.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class WrapperTrailers {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperTrailers.class);
private static final Logger logger = Logger.getLogger(WrapperTrailers.class);
/*
* Properties
*/
@@ -73,6 +73,6 @@ public class WrapperTrailers {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java
+2 -2
View File
@@ -23,7 +23,7 @@ public class WrapperTranslations {
* Logger
*/
private static final Logger LOGGER = Logger.getLogger(WrapperTranslations.class);
private static final Logger logger = Logger.getLogger(WrapperTranslations.class);
/*
* Properties
*/
@@ -60,6 +60,6 @@ public class WrapperTranslations {
StringBuilder sb = new StringBuilder();
sb.append("Unknown property: '").append(key);
sb.append("' value: '").append(value).append("'");
LOGGER.trace(sb.toString());
logger.trace(sb.toString());
}
}
src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
+36 -46
View File
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
public class TheMovieDbApiTest {
// Logger
private static final Logger LOGGER = Logger.getLogger(TheMovieDbApiTest.class);
private static final Logger logger = Logger.getLogger(TheMovieDbApiTest.class);
// API Key
private static final String API_KEY = "5a1a77e2eba8984804586122754f969f";
private static TheMovieDbApi tmdb;
@@ -61,8 +61,6 @@ public class TheMovieDbApiTest {
public static void setUpClass() throws Exception {
// Set the logger level to TRACE
Logger.getRootLogger().setLevel(Level.TRACE);
// Show the version of the API
TheMovieDbApi.showVersion();
}
@AfterClass
@@ -84,7 +82,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testConfiguration() throws IOException {
LOGGER.info("Test Configuration");
logger.info("Test Configuration");
TmdbConfiguration tmdbConfig = tmdb.getConfiguration();
assertNotNull("Configuration failed", tmdbConfig);
@@ -92,15 +90,7 @@ public class TheMovieDbApiTest {
assertTrue("No backdrop sizes", tmdbConfig.getBackdropSizes().size() > 0);
assertTrue("No poster sizes", tmdbConfig.getPosterSizes().size() > 0);
assertTrue("No profile sizes", tmdbConfig.getProfileSizes().size() > 0);
LOGGER.info(tmdbConfig.toString());
}
/**
* Test of showVersion method, of class TheMovieDbApi.
*/
@Test
public void testShowVersion() {
// Not required
logger.info(tmdbConfig.toString());
}
/**
@@ -108,7 +98,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testSearchMovie() throws MovieDbException {
LOGGER.info("searchMovie");
logger.info("searchMovie");
// Try a movie with less than 1 page of results
List<MovieDb> movieList = tmdb.searchMovie("Blade Runner", 0, "", true, 0);
@@ -129,7 +119,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieInfo() throws MovieDbException {
LOGGER.info("getMovieInfo");
logger.info("getMovieInfo");
String language = "en";
MovieDb result = tmdb.getMovieInfo(ID_MOVIE_BLADE_RUNNER, language);
assertEquals("Incorrect movie information", "Blade Runner", result.getOriginalTitle());
@@ -140,7 +130,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieAlternativeTitles() throws MovieDbException {
LOGGER.info("getMovieAlternativeTitles");
logger.info("getMovieAlternativeTitles");
String country = "";
List<AlternativeTitle> results = tmdb.getMovieAlternativeTitles(ID_MOVIE_BLADE_RUNNER, country);
assertTrue("No alternative titles found", results.size() > 0);
@@ -156,7 +146,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieCasts() throws MovieDbException {
LOGGER.info("getMovieCasts");
logger.info("getMovieCasts");
List<Person> people = tmdb.getMovieCasts(ID_MOVIE_BLADE_RUNNER);
assertTrue("No cast information", people.size() > 0);
@@ -183,7 +173,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieImages() throws MovieDbException {
LOGGER.info("getMovieImages");
logger.info("getMovieImages");
String language = "";
List<Artwork> result = tmdb.getMovieImages(ID_MOVIE_BLADE_RUNNER, language);
assertFalse("No artwork found", result.isEmpty());
@@ -194,7 +184,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieKeywords() throws MovieDbException {
LOGGER.info("getMovieKeywords");
logger.info("getMovieKeywords");
List<Keyword> result = tmdb.getMovieKeywords(ID_MOVIE_BLADE_RUNNER);
assertFalse("No keywords found", result.isEmpty());
}
@@ -204,7 +194,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieReleaseInfo() throws MovieDbException {
LOGGER.info("getMovieReleaseInfo");
logger.info("getMovieReleaseInfo");
List<ReleaseInfo> result = tmdb.getMovieReleaseInfo(ID_MOVIE_BLADE_RUNNER, "");
assertFalse("Release information missing", result.isEmpty());
}
@@ -214,7 +204,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieTrailers() throws MovieDbException {
LOGGER.info("getMovieTrailers");
logger.info("getMovieTrailers");
List<Trailer> result = tmdb.getMovieTrailers(ID_MOVIE_BLADE_RUNNER, "");
assertFalse("Movie trailers missing", result.isEmpty());
}
@@ -224,7 +214,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieTranslations() throws MovieDbException {
LOGGER.info("getMovieTranslations");
logger.info("getMovieTranslations");
List<Translation> result = tmdb.getMovieTranslations(ID_MOVIE_BLADE_RUNNER);
assertFalse("No translations found", result.isEmpty());
}
@@ -234,7 +224,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetCollectionInfo() throws MovieDbException {
LOGGER.info("getCollectionInfo");
logger.info("getCollectionInfo");
String language = "";
CollectionInfo result = tmdb.getCollectionInfo(ID_MOVIE_STAR_WARS_COLLECTION, language);
assertFalse("No collection information", result.getParts().isEmpty());
@@ -246,7 +236,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testCreateImageUrl() throws MovieDbException {
LOGGER.info("createImageUrl");
logger.info("createImageUrl");
MovieDb movie = tmdb.getMovieInfo(ID_MOVIE_BLADE_RUNNER, "");
String result = tmdb.createImageUrl(movie.getPosterPath(), "original").toString();
assertTrue("Error compiling image URL", !result.isEmpty());
@@ -257,7 +247,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetMovieInfoImdb() throws MovieDbException {
LOGGER.info("getMovieInfoImdb");
logger.info("getMovieInfoImdb");
MovieDb result = tmdb.getMovieInfoImdb("tt0076759", "en-US");
assertTrue("Error getting the movie from IMDB ID", result.getId() == 11);
}
@@ -291,7 +281,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testSearchPeople() throws MovieDbException {
LOGGER.info("searchPeople");
logger.info("searchPeople");
String personName = "Bruce Willis";
boolean allResults = false;
List<Person> result = tmdb.searchPeople(personName, allResults);
@@ -303,7 +293,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetPersonInfo() throws MovieDbException {
LOGGER.info("getPersonInfo");
logger.info("getPersonInfo");
Person result = tmdb.getPersonInfo(ID_PERSON_BRUCE_WILLIS);
assertTrue("Wrong actor returned", result.getId() == ID_PERSON_BRUCE_WILLIS);
}
@@ -313,7 +303,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetPersonCredits() throws MovieDbException {
LOGGER.info("getPersonCredits");
logger.info("getPersonCredits");
List<PersonCredit> people = tmdb.getPersonCredits(ID_PERSON_BRUCE_WILLIS);
assertTrue("No cast information", people.size() > 0);
@@ -324,7 +314,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetPersonImages() throws MovieDbException {
LOGGER.info("getPersonImages");
logger.info("getPersonImages");
List<Artwork> artwork = tmdb.getPersonImages(ID_PERSON_BRUCE_WILLIS);
assertTrue("No cast information", artwork.size() > 0);
@@ -335,7 +325,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetLatestMovie() throws MovieDbException {
LOGGER.info("getLatestMovie");
logger.info("getLatestMovie");
MovieDb result = tmdb.getLatestMovie();
assertTrue("No latest movie found", result != null);
assertTrue("No latest movie found", result.getId() > 0);
@@ -370,7 +360,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetNowPlayingMovies() throws MovieDbException {
LOGGER.info("getNowPlayingMovies");
logger.info("getNowPlayingMovies");
List<MovieDb> results = tmdb.getNowPlayingMovies("", true);
assertTrue("No now playing movies found", !results.isEmpty());
}
@@ -380,7 +370,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetPopularMovieList() throws MovieDbException {
LOGGER.info("getPopularMovieList");
logger.info("getPopularMovieList");
List<MovieDb> results = tmdb.getPopularMovieList("", true);
assertTrue("No popular movies found", !results.isEmpty());
}
@@ -390,7 +380,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetTopRatedMovies() throws MovieDbException {
LOGGER.info("getTopRatedMovies");
logger.info("getTopRatedMovies");
List<MovieDb> results = tmdb.getTopRatedMovies("", true);
assertTrue("No top rated movies found", !results.isEmpty());
}
@@ -400,7 +390,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetCompanyInfo() throws MovieDbException {
LOGGER.info("getCompanyInfo");
logger.info("getCompanyInfo");
Company company = tmdb.getCompanyInfo(ID_COMPANY_LUCASFILM);
assertTrue("No company information found", company.getCompanyId() > 0);
}
@@ -410,7 +400,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetCompanyMovies() throws MovieDbException {
LOGGER.info("getCompanyMovies");
logger.info("getCompanyMovies");
List<MovieDb> results = tmdb.getCompanyMovies(ID_COMPANY_LUCASFILM, "", true);
assertTrue("No company movies found", !results.isEmpty());
}
@@ -420,7 +410,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testSearchCompanies() throws MovieDbException {
LOGGER.info("searchCompanies");
logger.info("searchCompanies");
List<Company> results = tmdb.searchCompanies(COMPANY_NAME, "", true);
assertTrue("No company information found", !results.isEmpty());
}
@@ -430,7 +420,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetSimilarMovies() throws MovieDbException {
LOGGER.info("getSimilarMovies");
logger.info("getSimilarMovies");
List<MovieDb> results = tmdb.getSimilarMovies(ID_MOVIE_BLADE_RUNNER, "", true);
assertTrue("No similar movies found", !results.isEmpty());
}
@@ -440,7 +430,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetGenreList() throws MovieDbException {
LOGGER.info("getGenreList");
logger.info("getGenreList");
List<Genre> results = tmdb.getGenreList("");
assertTrue("No genres found", !results.isEmpty());
}
@@ -450,7 +440,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetGenreMovies() throws MovieDbException {
LOGGER.info("getGenreMovies");
logger.info("getGenreMovies");
List<MovieDb> results = tmdb.getGenreMovies(ID_GENRE_ACTION, "", true);
assertTrue("No genre movies found", !results.isEmpty());
}
@@ -460,7 +450,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetUpcoming() throws Exception {
LOGGER.info("getUpcoming");
logger.info("getUpcoming");
List<MovieDb> results = tmdb.getUpcoming("");
assertTrue("No upcoming movies found", !results.isEmpty());
}
@@ -470,7 +460,7 @@ public class TheMovieDbApiTest {
*/
@Test
public void testGetCollectionImages() throws Exception {
LOGGER.info("getCollectionImages");
logger.info("getCollectionImages");
String language = "";
List<Artwork> result = tmdb.getCollectionImages(ID_MOVIE_STAR_WARS_COLLECTION, language);
assertFalse("No artwork found", result.isEmpty());
@@ -481,11 +471,11 @@ public class TheMovieDbApiTest {
*/
// @Test
public void testGetAuthorisationToken() throws Exception {
LOGGER.info("getAuthorisationToken");
logger.info("getAuthorisationToken");
TokenAuthorisation result = tmdb.getAuthorisationToken();
assertFalse("Token is null", result == null);
assertTrue("Token is not valid", result.getSuccess());
LOGGER.info(result.toString());
logger.info(result.toString());
}
/**
@@ -493,15 +483,15 @@ public class TheMovieDbApiTest {
*/
// @Test
public void testGetSessionToken() throws Exception {
LOGGER.info("getSessionToken");
logger.info("getSessionToken");
TokenAuthorisation token = tmdb.getAuthorisationToken();
assertFalse("Token is null", token == null);
assertTrue("Token is not valid", token.getSuccess());
LOGGER.info(token.toString());
logger.info(token.toString());
TokenSession result = tmdb.getSessionToken(token);
assertFalse("Session token is null", result == null);
assertTrue("Session token is not valid", result.getSuccess());
LOGGER.info(result.toString());
logger.info(result.toString());
}
}