Change logging for abstract wrapper

2013-09-25 09:48:47 +01:00
parent d3338cc106
commit 2ef41457d0
26 changed files with 9 additions and 108 deletions
@@ -48,7 +48,7 @@ public abstract class AbstractJsonMapping implements Serializable {
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");

-        getLogger(this.getClass()).warn(sb.toString());
+        getLogger(this.getClass()).trace(sb.toString());
    }

    @Override
@@ -31,10 +31,10 @@ import org.slf4j.LoggerFactory;

 public abstract class AbstractWrapper {

-    private Logger log;
+    private static final long serialVersionUID = 1L;

-    public AbstractWrapper(Class classToLog) {
-        this.log = LoggerFactory.getLogger(classToLog);
+    private static Logger getLogger(Class<?> aClass) {
+        return LoggerFactory.getLogger(aClass);
    }

    /**
@@ -64,7 +64,7 @@ public abstract class AbstractWrapper {
        StringBuilder sb = new StringBuilder();
        sb.append("Unknown property: '").append(key);
        sb.append("' value: '").append(value).append("'");
-        log.trace(sb.toString());
+        getLogger(this.getClass()).trace(sb.toString());
    }

    @Override
@@ -27,9 +27,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 * @author Stuart
 */
 public class AbstractWrapperAll extends AbstractWrapperId implements IWrapperId, IWrapperPages, IWrapperDates {
-    /*
-     * Properties
-     */

    @JsonProperty("page")
    private int page;
@@ -40,10 +37,6 @@ public class AbstractWrapperAll extends AbstractWrapperId implements IWrapperId,
    @JsonProperty("dates")
    private ResultDates dates = new ResultDates();

-    public AbstractWrapperAll(Class classToLog) {
-        super(classToLog);
-    }
-
    @Override
    public int getPage() {
        return page;
@@ -27,17 +27,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 * @author Stuart
 */
 public class AbstractWrapperId extends AbstractWrapper implements IWrapperId {
-    /*
-     * Properties
-     */

+    private static final long serialVersionUID = 1L;
    @JsonProperty("id")
    private int id;

-    public AbstractWrapperId(Class classToLog) {
-        super(classToLog);
-    }
-
    @Override
    public int getId() {
        return id;
@@ -32,10 +32,6 @@ public class WrapperAlternativeTitles extends AbstractWrapperId {
    @JsonProperty("titles")
    private List<AlternativeTitle> titles;

-    public WrapperAlternativeTitles() {
-        super(WrapperAlternativeTitles.class);
-    }
-
    public List<AlternativeTitle> getTitles() {
        return titles;
    }
@@ -32,10 +32,6 @@ public class WrapperCollection extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<Collection> results;

-    public WrapperCollection() {
-        super(WrapperCollection.class);
-    }
-
    public List<Collection> getResults() {
        return results;
    }
@@ -32,10 +32,6 @@ public class WrapperCompany extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<Company> results;

-    public WrapperCompany() {
-        super(WrapperCompany.class);
-    }
-
    public List<Company> getResults() {
        return results;
    }
@@ -32,10 +32,6 @@ public class WrapperCompanyMovies extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<MovieDb> results;

-    public WrapperCompanyMovies() {
-        super(WrapperCompanyMovies.class);
-    }
-
    public List<MovieDb> getResults() {
        return results;
    }
@@ -35,10 +35,6 @@ public class WrapperConfig extends AbstractWrapper {
    @JsonProperty("change_keys")
    private List<String> changeKeys = Collections.EMPTY_LIST;

-    public WrapperConfig() {
-        super(WrapperConfig.class);
-    }
-
    public TmdbConfiguration getTmdbConfiguration() {
        return tmdbConfiguration;
    }
@@ -33,10 +33,6 @@ public class WrapperGenres extends AbstractWrapper {
    @JsonProperty("genres")
    private List<Genre> genres;

-    public WrapperGenres() {
-        super(WrapperGenres.class);
-    }
-
    public List<Genre> getGenres() {
        return genres;
    }
@@ -40,10 +40,6 @@ public class WrapperImages extends AbstractWrapperAll {
    @JsonProperty("profiles")
    private List<Artwork> profiles = Collections.EMPTY_LIST;

-    public WrapperImages() {
-        super(WrapperImages.class);
-    }
-
    public List<Artwork> getBackdrops() {
        return backdrops;
    }
@@ -32,10 +32,6 @@ public class WrapperJobList extends AbstractWrapper {
    @JsonProperty("jobs")
    private List<JobDepartment> jobs;

-    public WrapperJobList() {
-        super(WrapperJobList.class);
-    }
-
    public List<JobDepartment> getJobs() {
        return jobs;
    }
@@ -32,10 +32,6 @@ public class WrapperKeywordMovies extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<KeywordMovie> results;

-    public WrapperKeywordMovies() {
-        super(WrapperKeywordMovies.class);
-    }
-
    public List<KeywordMovie> getResults() {
        return results;
    }
@@ -32,10 +32,6 @@ public class WrapperKeywords extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<Keyword> results;

-    public WrapperKeywords() {
-        super(WrapperKeywords.class);
-    }
-
    public List<Keyword> getResults() {
        return results;
    }
@@ -32,10 +32,6 @@ public class WrapperMovie extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<MovieDb> movies;

-    public WrapperMovie() {
-        super(WrapperMovie.class);
-    }
-
    public List<MovieDb> getMovies() {
        return movies;
    }
@@ -37,10 +37,6 @@ public class WrapperMovieCasts extends AbstractWrapperId {
    @JsonProperty("crew")
    private List<PersonCrew> crew;

-    public WrapperMovieCasts() {
-        super(WrapperMovieCasts.class);
-    }
-
    public List<PersonCast> getCast() {
        return cast;
    }
@@ -11,10 +11,6 @@ public class WrapperMovieDbList extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<MovieDbList> lists;

-    public WrapperMovieDbList() {
-        super(WrapperMovieDbList.class);
-    }
-
    public List<MovieDbList> getLists() {
        return lists;
    }
@@ -32,10 +32,6 @@ public class WrapperMovieKeywords extends AbstractWrapperId {
    @JsonProperty("keywords")
    private List<Keyword> keywords;

-    public WrapperMovieKeywords() {
-        super(WrapperMovieKeywords.class);
-    }
-
    public List<Keyword> getKeywords() {
        return keywords;
    }
@@ -32,10 +32,6 @@ public class WrapperMovieList extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<MovieList> movieList;

-    public WrapperMovieList() {
-        super(WrapperMovieList.class);
-    }
-
    public List<MovieList> getMovieList() {
        return movieList;
    }
@@ -32,10 +32,6 @@ public class WrapperPerson extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<Person> results;

-    public WrapperPerson() {
-        super(WrapperPerson.class);
-    }
-
    public List<Person> getResults() {
        return results;
    }
@@ -36,10 +36,6 @@ public class WrapperPersonCredits extends AbstractWrapperAll {
    @JsonProperty("crew")
    private List<PersonCredit> crew;

-    public WrapperPersonCredits() {
-        super(WrapperMovieCasts.class);
-    }
-
    public List<PersonCredit> getCast() {
        return cast;
    }
@@ -32,10 +32,6 @@ public class WrapperPersonList extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<Person> personList;

-    public WrapperPersonList() {
-        super(WrapperPersonList.class);
-    }
-
    public List<Person> getPersonList() {
        return personList;
    }
@@ -32,10 +32,6 @@ public class WrapperReleaseInfo extends AbstractWrapperId {
    @JsonProperty("countries")
    private List<ReleaseInfo> countries;

-    public WrapperReleaseInfo() {
-        super(WrapperReleaseInfo.class);
-    }
-
    public List<ReleaseInfo> getCountries() {
        return countries;
    }
@@ -32,10 +32,6 @@ public class WrapperReviews extends AbstractWrapperAll {
    @JsonProperty("results")
    private List<Reviews> reviews;

-    public WrapperReviews() {
-        super(WrapperReviews.class);
-    }
-
    public List<Reviews> getReviews() {
        return reviews;
    }
@@ -21,6 +21,7 @@ package com.omertron.themoviedbapi.wrapper;

 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Trailer;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

@@ -28,17 +29,14 @@ import java.util.List;
 *
 * @author Stuart
 */
-public class WrapperTrailers extends AbstractWrapperId {
+public class WrapperTrailers extends AbstractWrapperId implements Serializable {

+    private static final long serialVersionUID = 1L;
    @JsonProperty("quicktime")
    private List<Trailer> quicktime;
    @JsonProperty("youtube")
    private List<Trailer> youtube;

-    public WrapperTrailers() {
-        super(WrapperTrailers.class);
-    }
-
    public List<Trailer> getQuicktime() {
        return quicktime;
    }
@@ -32,10 +32,6 @@ public class WrapperTranslations extends AbstractWrapperId {
    @JsonProperty("translations")
    private List<Translation> translations;

-    public WrapperTranslations() {
-        super(WrapperTranslations.class);
-    }
-
    public void setTranslations(List<Translation> translations) {
        this.translations = translations;
    }