From f69915b0030dd31cbbb3e8e47474e532dda59a88 Mon Sep 17 00:00:00 2001 From: Omertron Date: Wed, 25 Jan 2012 15:55:43 +0000 Subject: [PATCH] Fix some sonar issues --- .../moviejukebox/themoviedb/TheMovieDB.java | 36 +++++++++---------- .../themoviedb/model/AlternativeTitle.java | 4 +-- .../themoviedb/model/Artwork.java | 4 +-- .../themoviedb/model/Collection.java | 4 +-- .../themoviedb/model/CollectionInfo.java | 4 +-- .../moviejukebox/themoviedb/model/Genre.java | 4 +-- .../themoviedb/model/Keyword.java | 4 +-- .../themoviedb/model/Language.java | 4 +-- .../themoviedb/model/MovieDB.java | 4 +-- .../moviejukebox/themoviedb/model/Person.java | 4 +-- .../themoviedb/model/PersonCast.java | 4 +-- .../themoviedb/model/PersonCrew.java | 4 +-- .../themoviedb/model/ProductionCompany.java | 4 +-- .../themoviedb/model/ProductionCountry.java | 4 +-- .../themoviedb/model/ReleaseInfo.java | 4 +-- .../themoviedb/model/StatusCode.java | 8 ++--- .../themoviedb/model/TmdbConfiguration.java | 4 +-- .../themoviedb/model/Trailer.java | 4 +-- .../themoviedb/model/Translation.java | 4 +-- .../moviejukebox/themoviedb/tools/ApiUrl.java | 6 ++-- .../themoviedb/tools/FilteringLayout.java | 6 ++-- .../wrapper/WrapperAlternativeTitles.java | 4 +-- .../themoviedb/wrapper/WrapperMovieCasts.java | 4 +-- .../wrapper/WrapperMovieImages.java | 4 +-- .../wrapper/WrapperMovieKeywords.java | 4 +-- .../wrapper/WrapperReleaseInfo.java | 4 +-- .../themoviedb/wrapper/WrapperResultList.java | 13 +++---- .../themoviedb/wrapper/WrapperTrailers.java | 4 +-- .../wrapper/WrapperTranslations.java | 4 +-- .../themoviedb/TheMovieDBTest.java | 28 +++++++-------- 30 files changed, 96 insertions(+), 97 deletions(-) diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDB.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDB.java index 1fb78a653..0c711e869 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDB.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDB.java @@ -33,8 +33,8 @@ import org.codehaus.jackson.map.ObjectMapper; */ public class TheMovieDB { - private static final Logger logger = Logger.getLogger(TheMovieDB.class); - private static String API_KEY; + private static final Logger LOGGER = Logger.getLogger(TheMovieDB.class); + private static String apiKey; private static TmdbConfiguration tmdbConfig; /* * TheMovieDB API URLs @@ -66,7 +66,7 @@ public class TheMovieDB { private static ObjectMapper mapper = new ObjectMapper(); public TheMovieDB(String apiKey) throws IOException { - TheMovieDB.API_KEY = apiKey; + TheMovieDB.apiKey = apiKey; URL configUrl = TMDB_CONFIG_URL.getQueryUrl(""); mapper.configure(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE, true); tmdbConfig = mapper.readValue(configUrl, TmdbConfiguration.class); @@ -75,7 +75,7 @@ public class TheMovieDB { } public static String getApiKey() { - return API_KEY; + return apiKey; } public static String getApiBase() { @@ -94,7 +94,7 @@ public class TheMovieDB { WrapperResultList resultList = mapper.readValue(url, WrapperResultList.class); return resultList.getResults(); } catch (IOException ex) { - logger.warn("Failed to find movie: " + ex.getMessage()); + LOGGER.warn("Failed to find movie: " + ex.getMessage()); return new ArrayList(); } } @@ -109,10 +109,9 @@ public class TheMovieDB { public MovieDB getMovieInfo(int movieId, String language) { try { URL url = TMDB_MOVIE_INFO.getIdUrl(movieId, language); - MovieDB movieDb = mapper.readValue(url, MovieDB.class); - return movieDb; + return mapper.readValue(url, MovieDB.class); } catch (IOException ex) { - logger.warn("Failed to get movie info: " + ex.getMessage()); + LOGGER.warn("Failed to get movie info: " + ex.getMessage()); } return new MovieDB(); } @@ -129,7 +128,7 @@ public class TheMovieDB { WrapperAlternativeTitles at = mapper.readValue(url, WrapperAlternativeTitles.class); return at.getTitles(); } catch (IOException ex) { - logger.warn("Failed to get movie alternative titles: " + ex.getMessage()); + LOGGER.warn("Failed to get movie alternative titles: " + ex.getMessage()); } return new ArrayList(); } @@ -162,7 +161,7 @@ public class TheMovieDB { return people; } catch (IOException ex) { - logger.warn("Failed to get movie casts: " + ex.getMessage()); + LOGGER.warn("Failed to get movie casts: " + ex.getMessage()); } return people; } @@ -193,7 +192,7 @@ public class TheMovieDB { return artwork; } catch (IOException ex) { - logger.warn("Failed to get movie images: " + ex.getMessage()); + LOGGER.warn("Failed to get movie images: " + ex.getMessage()); } return artwork; } @@ -210,7 +209,7 @@ public class TheMovieDB { WrapperMovieKeywords mk = mapper.readValue(url, WrapperMovieKeywords.class); return mk.getKeywords(); } catch (IOException ex) { - logger.warn("Failed to get movie keywords: " + ex.getMessage()); + LOGGER.warn("Failed to get movie keywords: " + ex.getMessage()); } return new ArrayList(); } @@ -227,7 +226,7 @@ public class TheMovieDB { WrapperReleaseInfo ri = mapper.readValue(url, WrapperReleaseInfo.class); return ri.getCountries(); } catch (IOException ex) { - logger.warn("Failed to get movie release information: " + ex.getMessage()); + LOGGER.warn("Failed to get movie release information: " + ex.getMessage()); } return new ArrayList(); } @@ -258,7 +257,7 @@ public class TheMovieDB { } return trailers; } catch (IOException ex) { - logger.warn("Failed to get movie trailers: " + ex.getMessage()); + LOGGER.warn("Failed to get movie trailers: " + ex.getMessage()); } return trailers; } @@ -274,7 +273,7 @@ public class TheMovieDB { WrapperTranslations wt = mapper.readValue(url, WrapperTranslations.class); return wt.getTranslations(); } catch (IOException ex) { - logger.warn("Failed to get movie tranlations: " + ex.getMessage()); + LOGGER.warn("Failed to get movie tranlations: " + ex.getMessage()); } return new ArrayList(); } @@ -289,8 +288,7 @@ public class TheMovieDB { public CollectionInfo getCollectionInfo(int movieId, String language) { try { URL url = TMDB_COLLECTION_INFO.getIdUrl(movieId); - CollectionInfo col = mapper.readValue(url, CollectionInfo.class); - return col; + return mapper.readValue(url, CollectionInfo.class); } catch (IOException ex) { return new CollectionInfo(); } @@ -317,7 +315,7 @@ public class TheMovieDB { if (!tmdbConfig.isValidSize(requiredSize)) { sb = new StringBuilder(); sb.append(" - Invalid size requested: ").append(requiredSize); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); return returnUrl; } @@ -327,7 +325,7 @@ public class TheMovieDB { sb.append(imagePath); returnUrl = 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()); } return returnUrl; diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java index 785d863e7..1ae6dc978 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java @@ -25,7 +25,7 @@ public class AlternativeTitle { /* * Logger */ - private static final Logger logger = Logger.getLogger(AlternativeTitle.class); + private static final Logger LOGGER = Logger.getLogger(AlternativeTitle.class); /* * Properties */ @@ -64,7 +64,7 @@ public class AlternativeTitle { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java index 89e209bf8..981d25de7 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java @@ -25,7 +25,7 @@ public class Artwork { /* * Logger */ - private static final Logger logger = Logger.getLogger(Artwork.class); + private static final Logger LOGGER = Logger.getLogger(Artwork.class); /* * Properties */ @@ -123,7 +123,7 @@ public class Artwork { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java index 778c029fb..969710a71 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java @@ -28,7 +28,7 @@ public class Collection { /* * 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 { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java index ec7ed245b..fa6bd0a03 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java @@ -27,7 +27,7 @@ public class CollectionInfo { /* * 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 { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java index 9f261fe83..c0454277e 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java @@ -27,7 +27,7 @@ public class Genre { /* * 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 { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java index e53c02542..7de0e3ea9 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java @@ -27,7 +27,7 @@ public class Keyword { /* * Logger */ - private static final Logger logger = Logger.getLogger(Keyword.class); + private static final Logger LOGGER = Logger.getLogger(Keyword.class); /* * Properties */ @@ -66,7 +66,7 @@ public class Keyword { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java index 4238ee0df..012601e85 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java @@ -27,7 +27,7 @@ public class Language { /* * 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 { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDB.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDB.java index 98b367228..2ae8c93bb 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDB.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDB.java @@ -26,7 +26,7 @@ public class MovieDB { /* * Logger */ - private static final Logger logger = Logger.getLogger(MovieDB.class); + private static final Logger LOGGER = Logger.getLogger(MovieDB.class); /* * Properties */ @@ -265,7 +265,7 @@ public class MovieDB { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } // diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java index 97604115f..a26b34845 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java @@ -24,7 +24,7 @@ public class Person { * 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 @@ -164,7 +164,7 @@ public class Person { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java index 9eb2e5968..2d8ae21cf 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java @@ -25,7 +25,7 @@ public class PersonCast { * Logger */ - private static final Logger logger = Logger.getLogger(PersonCast.class); + private static final Logger LOGGER = Logger.getLogger(PersonCast.class); /* * Properties */ @@ -94,7 +94,7 @@ public class PersonCast { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java index 29d58cd6a..117ec79b2 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java @@ -25,7 +25,7 @@ public class PersonCrew { * Logger */ - private static final Logger logger = Logger.getLogger(PersonCrew.class); + private static final Logger LOGGER = Logger.getLogger(PersonCrew.class); /* * Properties */ @@ -94,7 +94,7 @@ public class PersonCrew { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java index 978b1038c..85fae5795 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java @@ -27,7 +27,7 @@ public class ProductionCompany { * Logger */ - private static final Logger logger = Logger.getLogger(ProductionCompany.class); + private static final Logger LOGGER = Logger.getLogger(ProductionCompany.class); /* * Properties */ @@ -66,7 +66,7 @@ public class ProductionCompany { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java index 2b3617e69..cc0556466 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java @@ -27,7 +27,7 @@ public class ProductionCountry { * Logger */ - private static final Logger logger = Logger.getLogger(ProductionCountry.class); + private static final Logger LOGGER = Logger.getLogger(ProductionCountry.class); /* * Properties */ @@ -66,7 +66,7 @@ public class ProductionCountry { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java index e46e6fb21..5e4735de9 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java @@ -25,7 +25,7 @@ public class ReleaseInfo { * Logger */ - private static final Logger logger = Logger.getLogger(ReleaseInfo.class); + private static final Logger LOGGER = Logger.getLogger(ReleaseInfo.class); /* * Properties */ @@ -74,7 +74,7 @@ public class ReleaseInfo { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java index 3a59038ee..bfad70828 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java @@ -25,14 +25,14 @@ public class StatusCode { * Logger */ - private static final Logger logger = Logger.getLogger(StatusCode.class); + private static final Logger LOGGER = Logger.getLogger(StatusCode.class); /* * Properties */ @JsonProperty("status_code") - int statusCode; + private int statusCode; @JsonProperty("status_message") - String statusMessage; + private String statusMessage; // public int getStatusCode() { @@ -64,7 +64,7 @@ public class StatusCode { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java index 4ce101f2b..7a25d1684 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java @@ -28,7 +28,7 @@ public class TmdbConfiguration { /* * Logger */ - private static final Logger logger = Logger.getLogger(TmdbConfiguration.class); + private static final Logger LOGGER = Logger.getLogger(TmdbConfiguration.class); /* * Properties */ @@ -134,7 +134,7 @@ public class TmdbConfiguration { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java index c41fc69b0..dfa07f5e3 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java @@ -24,7 +24,7 @@ public class Trailer { * Logger */ - private static final Logger logger = Logger.getLogger(Trailer.class); + private static final Logger LOGGER = Logger.getLogger(Trailer.class); /* * Website sources */ @@ -84,7 +84,7 @@ public class Trailer { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java index f57ceed75..7f1af5c0c 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java @@ -25,7 +25,7 @@ public class Translation { * Logger */ - private static final Logger logger = Logger.getLogger(Translation.class); + private static final Logger LOGGER = Logger.getLogger(Translation.class); /* * Properties */ @@ -74,7 +74,7 @@ public class Translation { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java index 566956f48..0b4b3e1a3 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java @@ -30,7 +30,7 @@ public class ApiUrl { /* * Logger */ - private static final Logger logger = Logger.getLogger(ApiUrl.class); + private static final Logger LOGGER = Logger.getLogger(ApiUrl.class); /* * Parameter configuration */ @@ -131,10 +131,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()); + LOGGER.warn("Failed to create URL " + urlString.toString()); return null; } } diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java index 8774ec2e3..f63079ea1 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java @@ -24,10 +24,10 @@ import org.apache.log4j.spi.LoggingEvent; * */ public class FilteringLayout extends PatternLayout { - private static Pattern API_KEYS = Pattern.compile("DO_NOT_MATCH"); + private static Pattern apiKeys = Pattern.compile("DO_NOT_MATCH"); public static void addApiKey(String apiKey) { - API_KEYS = Pattern.compile(apiKey); + apiKeys = Pattern.compile(apiKey); } /** @@ -40,7 +40,7 @@ public class FilteringLayout extends PatternLayout { if (event.getMessage() instanceof String) { String message = event.getRenderedMessage(); - Matcher matcher = API_KEYS.matcher(message); + Matcher matcher = apiKeys.matcher(message); if (matcher.find()) { String maskedMessage = matcher.replaceAll("[APIKEY]"); diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java index a1987b9ee..fd0669dbd 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java @@ -27,7 +27,7 @@ public class WrapperAlternativeTitles { * Logger */ - private static final Logger logger = Logger.getLogger(WrapperAlternativeTitles.class); + private static final Logger LOGGER = Logger.getLogger(WrapperAlternativeTitles.class); /* * Properties */ @@ -62,6 +62,6 @@ public class WrapperAlternativeTitles { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } } diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java index abd7580f9..763918df5 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java @@ -28,7 +28,7 @@ public class WrapperMovieCasts { * Logger */ - private static final Logger logger = Logger.getLogger(WrapperMovieCasts.class); + private static final Logger LOGGER = Logger.getLogger(WrapperMovieCasts.class); /* * Properties */ @@ -77,6 +77,6 @@ public class WrapperMovieCasts { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } } diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieImages.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieImages.java index 2c8ae3c15..3d163d4dc 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieImages.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieImages.java @@ -27,7 +27,7 @@ public class WrapperMovieImages { * Logger */ - private static final Logger logger = Logger.getLogger(WrapperMovieImages.class); + private static final Logger LOGGER = Logger.getLogger(WrapperMovieImages.class); /* * Properties */ @@ -76,6 +76,6 @@ public class WrapperMovieImages { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } } diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java index 9225248ed..df6c10f83 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java @@ -27,7 +27,7 @@ public class WrapperMovieKeywords { * Logger */ - private static final Logger logger = Logger.getLogger(WrapperMovieKeywords.class); + private static final Logger LOGGER = Logger.getLogger(WrapperMovieKeywords.class); /* * Properties */ @@ -66,6 +66,6 @@ public class WrapperMovieKeywords { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } } diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java index 195168111..08123fd83 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java @@ -27,7 +27,7 @@ public class WrapperReleaseInfo { * Logger */ - private static final Logger logger = Logger.getLogger(WrapperReleaseInfo.class); + private static final Logger LOGGER = Logger.getLogger(WrapperReleaseInfo.class); /* * Properties */ @@ -66,6 +66,6 @@ public class WrapperReleaseInfo { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } } diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperResultList.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperResultList.java index 51ac65507..8a2519fef 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperResultList.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperResultList.java @@ -27,18 +27,18 @@ public class WrapperResultList { * Logger */ - private static final Logger logger = Logger.getLogger(WrapperResultList.class); + private static final Logger LOGGER = Logger.getLogger(WrapperResultList.class); /* * Properties */ @JsonProperty("page") - int page; + private int page; @JsonProperty("results") - List results; + private List results; @JsonProperty("total_pages") - int totalPages; + private int totalPages; @JsonProperty("total_results") - int totalResults; + private int totalResults; // public int getPage() { @@ -75,6 +75,7 @@ public class WrapperResultList { this.totalResults = totalResults; } // + /** * Handle unknown properties and print a message * @param key @@ -85,7 +86,7 @@ public class WrapperResultList { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } @Override diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java index dd36047e8..e6447dffb 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java @@ -27,7 +27,7 @@ public class WrapperTrailers { * Logger */ - private static final Logger logger = Logger.getLogger(WrapperTrailers.class); + private static final Logger LOGGER = Logger.getLogger(WrapperTrailers.class); /* * Properties */ @@ -76,6 +76,6 @@ public class WrapperTrailers { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } } diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java index dc3a995cc..a270ea572 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java @@ -26,7 +26,7 @@ public class WrapperTranslations { * Logger */ - private static final Logger logger = Logger.getLogger(WrapperTranslations.class); + private static final Logger LOGGER = Logger.getLogger(WrapperTranslations.class); /* * Properties */ @@ -63,6 +63,6 @@ public class WrapperTranslations { StringBuilder sb = new StringBuilder(); sb.append("Unknown property: '").append(key); sb.append("' value: '").append(value).append("'"); - logger.warn(sb.toString()); + LOGGER.warn(sb.toString()); } } diff --git a/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDBTest.java b/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDBTest.java index f03cbedba..4a7a11944 100644 --- a/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDBTest.java +++ b/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDBTest.java @@ -28,7 +28,7 @@ import org.junit.*; */ public class TheMovieDBTest { - private static final Logger logger = Logger.getLogger(TheMovieDBTest.class); + private static final Logger LOGGER = Logger.getLogger(TheMovieDBTest.class); private static final String API_KEY = "5a1a77e2eba8984804586122754f969f"; private static TheMovieDB tmdb; /* @@ -62,7 +62,7 @@ public class TheMovieDBTest { */ @Test public void testConfiguration() throws IOException { - logger.info("Test Configuration"); + LOGGER.info("Test Configuration"); TmdbConfiguration tmdbConfig = tmdb.getConfiguration(); assertNotNull("Configuration failed", tmdbConfig); @@ -70,7 +70,7 @@ public class TheMovieDBTest { 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()); + LOGGER.info(tmdbConfig.toString()); } /** @@ -78,7 +78,7 @@ public class TheMovieDBTest { */ @Test public void testSearchMovie() throws UnsupportedEncodingException { - logger.info("searchMovie"); + LOGGER.info("searchMovie"); // Try a movie with less than 1 page of results List movieList = tmdb.searchMovie("Blade Runner", "", true); @@ -98,7 +98,7 @@ public class TheMovieDBTest { */ @Test public void testGetMovieInfo() { - logger.info("getMovieInfo"); + LOGGER.info("getMovieInfo"); String language = "en"; MovieDB result = tmdb.getMovieInfo(ID_BLADE_RUNNER, language); assertEquals("Incorrect movie information", "Blade Runner", result.getOriginalTitle()); @@ -109,7 +109,7 @@ public class TheMovieDBTest { */ @Test public void testGetMovieAlternativeTitles() { - logger.info("getMovieAlternativeTitles"); + LOGGER.info("getMovieAlternativeTitles"); String country = ""; List results = tmdb.getMovieAlternativeTitles(ID_BLADE_RUNNER, country); assertTrue("No alternative titles found", results.size() > 0); @@ -125,7 +125,7 @@ public class TheMovieDBTest { */ @Test public void testGetMovieCasts() { - logger.info("getMovieCasts"); + LOGGER.info("getMovieCasts"); List people = tmdb.getMovieCasts(ID_BLADE_RUNNER); assertTrue("No cast information", people.size() > 0); @@ -153,7 +153,7 @@ public class TheMovieDBTest { */ @Test public void testGetMovieImages() { - logger.info("getMovieImages"); + LOGGER.info("getMovieImages"); String language = ""; List result = tmdb.getMovieImages(ID_BLADE_RUNNER, language); assertFalse("No artwork found", result.isEmpty()); @@ -164,7 +164,7 @@ public class TheMovieDBTest { */ @Test public void testGetMovieKeywords() { - logger.info("getMovieKeywords"); + LOGGER.info("getMovieKeywords"); List result = tmdb.getMovieKeywords(ID_BLADE_RUNNER); assertFalse("No keywords found", result.isEmpty()); } @@ -174,7 +174,7 @@ public class TheMovieDBTest { */ @Test public void testGetMovieReleaseInfo() { - logger.info("getMovieReleaseInfo"); + LOGGER.info("getMovieReleaseInfo"); List result = tmdb.getMovieReleaseInfo(ID_BLADE_RUNNER, ""); assertFalse("Release information missing", result.isEmpty()); } @@ -184,7 +184,7 @@ public class TheMovieDBTest { */ @Test public void testGetMovieTrailers() { - logger.info("getMovieTrailers"); + LOGGER.info("getMovieTrailers"); List result = tmdb.getMovieTrailers(ID_BLADE_RUNNER, ""); assertFalse("Movie trailers missing", result.isEmpty()); } @@ -194,7 +194,7 @@ public class TheMovieDBTest { */ @Test public void testGetMovieTranslations() { - logger.info("getMovieTranslations"); + LOGGER.info("getMovieTranslations"); List result = tmdb.getMovieTranslations(ID_BLADE_RUNNER); assertFalse("No translations found", result.isEmpty()); } @@ -204,7 +204,7 @@ public class TheMovieDBTest { */ @Test public void testGetCollectionInfo() { - logger.info("getCollectionInfo"); + LOGGER.info("getCollectionInfo"); String language = ""; CollectionInfo result = tmdb.getCollectionInfo(ID_STAR_WARS_COLLECTION, language); assertFalse("No collection information", result.getParts().isEmpty()); @@ -212,7 +212,7 @@ public class TheMovieDBTest { @Test public void testCreateImageUrl() { - logger.info("createImageUrl"); + LOGGER.info("createImageUrl"); MovieDB movie = tmdb.getMovieInfo(ID_BLADE_RUNNER, ""); String result = tmdb.createImageUrl(movie.getPosterPath(), "original").toString(); assertTrue("Error compiling image URL", !result.isEmpty());