From 1e45b87508b35902bf1e45045f4ddcec692aab71 Mon Sep 17 00:00:00 2001 From: Omertron <> Date: Sun, 3 Feb 2013 19:25:23 +0000 Subject: [PATCH] Refactored to use a base class --- .../themoviedbapi/wrapper/WrapperBase.java | 105 ++++++++++++++++++ .../wrapper/WrapperCollection.java | 57 +--------- .../themoviedbapi/wrapper/WrapperCompany.java | 55 +-------- .../wrapper/WrapperCompanyMovies.java | 73 ++---------- .../themoviedbapi/wrapper/WrapperImages.java | 34 +----- .../wrapper/WrapperKeywords.java | 57 +--------- .../themoviedbapi/wrapper/WrapperMovie.java | 81 ++------------ .../wrapper/WrapperMovieList.java | 68 +----------- .../themoviedbapi/wrapper/WrapperPerson.java | 55 +-------- .../wrapper/WrapperPersonCredits.java | 47 ++------ .../wrapper/WrapperTranslations.java | 3 + 11 files changed, 157 insertions(+), 478 deletions(-) create mode 100644 src/main/java/com/omertron/themoviedbapi/wrapper/WrapperBase.java diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperBase.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperBase.java new file mode 100644 index 000000000..a43a972d0 --- /dev/null +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperBase.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2004-2013 Stuart Boston + * + * This file is part of TheMovieDB API. + * + * TheMovieDB API is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * TheMovieDB API is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with TheMovieDB API. If not, see . + * + */ +package com.omertron.themoviedbapi.wrapper; + +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.omertron.themoviedbapi.model.AlternativeTitle; +import com.omertron.themoviedbapi.model.MovieList; +import java.util.List; +import org.apache.log4j.Logger; + +/** + * Base class for the wrappers + * + * @author Stuart + */ +public class WrapperBase { + /* + * Logger - set but the sub-classes + */ + + private Logger logger; + /* + * Properties + */ + @JsonProperty("id") + private int id; + @JsonProperty("page") + private int page; + @JsonProperty("total_pages") + private int totalPages; + @JsonProperty("total_results") + private int totalResults; + + public WrapperBase(Logger logger) { + this.logger = logger; + } + + // + public int getId() { + return id; + } + + public int getPage() { + return page; + } + + public int getTotalPages() { + return totalPages; + } + + public int getTotalResults() { + return totalResults; + } + // + + // + public void setId(int id) { + this.id = id; + } + + public void setPage(int page) { + this.page = page; + } + + public void setTotalPages(int totalPages) { + this.totalPages = totalPages; + } + + public void setTotalResults(int totalResults) { + this.totalResults = totalResults; + } + // + + /** + * Handle unknown properties and print a message + * + * @param key + * @param value + */ + @JsonAnySetter + public void handleUnknown(String key, Object value) { + StringBuilder sb = new StringBuilder(); + sb.append("Unknown property: '").append(key); + sb.append("' value: '").append(value).append("'"); + logger.trace(sb.toString()); + } +} diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java index 6cc493b2d..39a6115d8 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java @@ -19,10 +19,8 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.Collection; -import com.omertron.themoviedbapi.model.MovieChanges; import java.util.List; import org.apache.log4j.Logger; @@ -30,71 +28,22 @@ import org.apache.log4j.Logger; * * @author stuart.boston */ -public class WrapperCollection { - /* - * Logger - */ - - private static final Logger logger = Logger.getLogger(WrapperCollection.class); +public class WrapperCollection extends WrapperBase { /* * Properties */ - @JsonProperty("page") - private int page; @JsonProperty("results") private List results; - @JsonProperty("total_pages") - private int totalPages; - @JsonProperty("total_results") - private int totalResults; - // - public int getPage() { - return page; + public WrapperCollection() { + super(Logger.getLogger(WrapperCollection.class)); } public List getResults() { return results; } - public int getTotalPages() { - return totalPages; - } - - public int getTotalResults() { - return totalResults; - } - // - - // - public void setPage(int page) { - this.page = page; - } - public void setResults(List results) { this.results = results; } - - public void setTotalPages(int totalPages) { - this.totalPages = totalPages; - } - - public void setTotalResults(int totalResults) { - this.totalResults = totalResults; - } - // - - /** - * Handle unknown properties and print a message - * - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); - } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java index bb076f7ac..760985d65 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java @@ -19,7 +19,6 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.Company; import java.util.List; @@ -29,70 +28,22 @@ import org.apache.log4j.Logger; * * @author stuart.boston */ -public class WrapperCompany { - /* - * Logger - */ - - private static final Logger logger = Logger.getLogger(WrapperCompany.class); +public class WrapperCompany extends WrapperBase{ /* * Properties */ - @JsonProperty("page") - private int page; @JsonProperty("results") private List results; - @JsonProperty("total_pages") - private int totalPages; - @JsonProperty("total_results") - private int totalResults; - // - public int getPage() { - return page; + public WrapperCompany() { + super(Logger.getLogger(WrapperCompany.class)); } public List getResults() { return results; } - public int getTotalPages() { - return totalPages; - } - - public int getTotalResults() { - return totalResults; - } - // - - // - public void setPage(int page) { - this.page = page; - } - public void setResults(List results) { this.results = results; } - - public void setTotalPages(int totalPages) { - this.totalPages = totalPages; - } - - public void setTotalResults(int totalResults) { - this.totalResults = totalResults; - } - // - - /** - * Handle unknown properties and print a message - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); - } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java index 0aee40c4f..25b3d8ccf 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java @@ -19,7 +19,6 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.MovieDb; import java.util.List; @@ -29,88 +28,34 @@ import org.apache.log4j.Logger; * * @author stuart.boston */ -public class WrapperCompanyMovies { - // Loggers - private static final Logger logger = Logger.getLogger(WrapperCompanyMovies.class); +public class WrapperCompanyMovies extends WrapperBase { /* * Properties */ - @JsonProperty("id") - private int companyId; - @JsonProperty("page") - private int page; + @JsonProperty("results") private List results; - @JsonProperty("total_pages") - private int totalPages; - @JsonProperty("total_results") - private int totalResults; - // - public int getCompanyId() { - return companyId; - } - - public int getPage() { - return page; + public WrapperCompanyMovies() { + super(Logger.getLogger(WrapperCompanyMovies.class)); } public List getResults() { return results; } - public int getTotalPages() { - return totalPages; - } - - public int getTotalResults() { - return totalResults; - } - // - - // - public void setCompanyId(int companyId) { - this.companyId = companyId; - } - - public void setPage(int page) { - this.page = page; - } - public void setResults(List results) { this.results = results; } - public void setTotalPages(int totalPages) { - this.totalPages = totalPages; - } - - public void setTotalResults(int totalResults) { - this.totalResults = totalResults; - } - // - - /** - * Handle unknown properties and print a message - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); - } - @Override public String toString() { StringBuilder sb = new StringBuilder("[ResultList=["); - sb.append("[companyId=").append(companyId); - sb.append("],[page=").append(page); - sb.append("],[pageResults=").append(results.size()); - sb.append("],[totalPages=").append(totalPages); - sb.append("],[totalResults=").append(totalResults); + sb.append("[companyId=").append(getId()); + sb.append("],[page=").append(getPage()); + sb.append("],[pageResults=").append(getResults().size()); + sb.append("],[totalPages=").append(getTotalPages()); + sb.append("],[totalResults=").append(getTotalResults()); sb.append("]]"); return sb.toString(); } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java index 089f68a16..adaaebae0 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java @@ -19,7 +19,6 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.Artwork; import java.util.List; @@ -29,17 +28,10 @@ import org.apache.log4j.Logger; * * @author Stuart */ -public class WrapperImages { - /* - * Logger - */ - - private static final Logger logger = Logger.getLogger(WrapperImages.class); +public class WrapperImages extends WrapperBase { /* * Properties */ - @JsonProperty("id") - private int id; @JsonProperty("backdrops") private List backdrops; @JsonProperty("posters") @@ -47,11 +39,11 @@ public class WrapperImages { @JsonProperty("profiles") private List profiles; - // - public int getId() { - return id; + public WrapperImages() { + super(Logger.getLogger(WrapperImages.class)); } + // public List getBackdrops() { return backdrops; } @@ -66,10 +58,6 @@ public class WrapperImages { // // - public void setId(int id) { - this.id = id; - } - public void setBackdrops(List backdrops) { this.backdrops = backdrops; } @@ -82,18 +70,4 @@ public class WrapperImages { this.profiles = profiles; } // - - /** - * Handle unknown properties and print a message - * - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); - } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java index b10833a25..7d23a6e20 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java @@ -19,9 +19,7 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.Collection; import com.omertron.themoviedbapi.model.Keyword; import java.util.List; import org.apache.log4j.Logger; @@ -30,71 +28,22 @@ import org.apache.log4j.Logger; * * @author stuart.boston */ -public class WrapperKeywords { - /* - * Logger - */ - - private static final Logger logger = Logger.getLogger(WrapperKeywords.class); +public class WrapperKeywords extends WrapperBase { /* * Properties */ - @JsonProperty("page") - private int page; @JsonProperty("results") private List results; - @JsonProperty("total_pages") - private int totalPages; - @JsonProperty("total_results") - private int totalResults; - // - public int getPage() { - return page; + public WrapperKeywords() { + super(Logger.getLogger(WrapperKeywords.class)); } public List getResults() { return results; } - public int getTotalPages() { - return totalPages; - } - - public int getTotalResults() { - return totalResults; - } - // - - // - public void setPage(int page) { - this.page = page; - } - public void setResults(List results) { this.results = results; } - - public void setTotalPages(int totalPages) { - this.totalPages = totalPages; - } - - public void setTotalResults(int totalResults) { - this.totalResults = totalResults; - } - // - - /** - * Handle unknown properties and print a message - * - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); - } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java index 7fd99fae9..ac99dea49 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java @@ -19,7 +19,6 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.MovieDb; import java.util.List; @@ -29,92 +28,34 @@ import org.apache.log4j.Logger; * * @author stuart.boston */ -public class WrapperMovie { - /* - * Logger - */ - - private static final Logger logger = Logger.getLogger(WrapperMovie.class); +public class WrapperMovie extends WrapperBase { /* * Properties */ - @JsonProperty("page") - private int page; + @JsonProperty("results") private List movies; - @JsonProperty("total_pages") - private int totalPages; - @JsonProperty("total_results") - private int totalResults; - @JsonProperty("id") - private int id; - // - public int getPage() { - return page; + public WrapperMovie() { + super(Logger.getLogger(WrapperMovie.class)); } public List getMovies() { return movies; } - public int getTotalPages() { - return totalPages; - } - - public int getTotalResults() { - return totalResults; - } - - public int getId() { - return id; - } - // - - // - public void setPage(int page) { - this.page = page; - } - - public void setMovies(List results) { - this.movies = results; - } - - public void setTotalPages(int totalPages) { - this.totalPages = totalPages; - } - - public void setTotalResults(int totalResults) { - this.totalResults = totalResults; - } - - public void setId(int id) { - this.id = id; - } - // - - /** - * Handle unknown properties and print a message - * - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); + public void setMovies(List movies) { + this.movies = movies; } @Override public String toString() { StringBuilder sb = new StringBuilder("[ResultList=["); - sb.append("[page=").append(page); - sb.append("],[pageResults=").append(movies.size()); - sb.append("],[totalPages=").append(totalPages); - sb.append("],[totalResults=").append(totalResults); - sb.append("],[id=").append(id); + sb.append("[page=").append(getPage()); + sb.append("],[pageResults=").append(getMovies().size()); + sb.append("],[totalPages=").append(getTotalPages()); + sb.append("],[totalResults=").append(getTotalResults()); + sb.append("],[id=").append(getId()); sb.append("]]"); return sb.toString(); } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieList.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieList.java index a080dab10..f05ed67da 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieList.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieList.java @@ -19,9 +19,7 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import com.omertron.themoviedbapi.model.AlternativeTitle; import com.omertron.themoviedbapi.model.MovieList; import java.util.List; import org.apache.log4j.Logger; @@ -30,81 +28,23 @@ import org.apache.log4j.Logger; * * @author Stuart */ -public class WrapperMovieList { - /* - * Logger - */ - - private static final Logger logger = Logger.getLogger(WrapperMovieList.class); +public class WrapperMovieList extends WrapperBase { /* * Properties */ - @JsonProperty("id") - private int id; - @JsonProperty("page") - private int page; + @JsonProperty("results") private List movieList; - @JsonProperty("total_pages") - private int totalPages; - @JsonProperty("total_results") - private int totalResults; - // - public int getId() { - return id; - } - - public int getPage() { - return page; + public WrapperMovieList() { + super(Logger.getLogger(WrapperMovieList.class)); } public List getMovieList() { return movieList; } - public int getTotalPages() { - return totalPages; - } - - public int getTotalResults() { - return totalResults; - } - // - - // - public void setId(int id) { - this.id = id; - } - - public void setPage(int page) { - this.page = page; - } - public void setMovieList(List movieList) { this.movieList = movieList; } - - public void setTotalPages(int totalPages) { - this.totalPages = totalPages; - } - - public void setTotalResults(int totalResults) { - this.totalResults = totalResults; - } - // - - /** - * Handle unknown properties and print a message - * - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); - } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java index cde1e8f6e..7e33aff4c 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java @@ -19,7 +19,6 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.Person; import java.util.List; @@ -29,70 +28,22 @@ import org.apache.log4j.Logger; * * @author stuart.boston */ -public class WrapperPerson { - /* - * Logger - */ - - private static final Logger logger = Logger.getLogger(WrapperPerson.class); +public class WrapperPerson extends WrapperBase { /* * Properties */ - @JsonProperty("page") - private int page; @JsonProperty("results") private List results; - @JsonProperty("total_pages") - private int totalPages; - @JsonProperty("total_results") - private int totalResults; - // - public int getPage() { - return page; + public WrapperPerson() { + super(Logger.getLogger(WrapperPerson.class)); } public List getResults() { return results; } - public int getTotalPages() { - return totalPages; - } - - public int getTotalResults() { - return totalResults; - } - // - - // - public void setPage(int page) { - this.page = page; - } - public void setResults(List results) { this.results = results; } - - public void setTotalPages(int totalPages) { - this.totalPages = totalPages; - } - - public void setTotalResults(int totalResults) { - this.totalResults = totalResults; - } - // - - /** - * Handle unknown properties and print a message - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); - } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java index 82d47cae9..65a2b509d 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java @@ -19,7 +19,6 @@ */ package com.omertron.themoviedbapi.wrapper; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.PersonCredit; import java.util.List; @@ -29,60 +28,32 @@ import org.apache.log4j.Logger; * * @author stuart.boston */ -public class WrapperPersonCredits { - /* - * Logger - */ - - private static final Logger logger = Logger.getLogger(WrapperMovieCasts.class); +public class WrapperPersonCredits extends WrapperBase{ /* * Properties */ - @JsonProperty("id") - private int id; @JsonProperty("cast") private List cast; @JsonProperty("crew") private List crew; - // + public WrapperPersonCredits() { + super(Logger.getLogger(WrapperMovieCasts.class)); + } + public List getCast() { return cast; } + public void setCast(List cast) { + this.cast = cast; + } + public List getCrew() { return crew; } - public int getId() { - return id; - } - // - - // - public void setCast(List cast) { - this.cast = cast; - } - public void setCrew(List crew) { this.crew = crew; } - - public void setId(int id) { - this.id = id; - } - // - - /** - * Handle unknown properties and print a message - * @param key - * @param value - */ - @JsonAnySetter - public void handleUnknown(String key, Object value) { - StringBuilder sb = new StringBuilder(); - sb.append("Unknown property: '").append(key); - sb.append("' value: '").append(value).append("'"); - logger.trace(sb.toString()); - } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java index 00b2487e7..466d52ca3 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java @@ -20,6 +20,7 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.Translation; import java.util.List; import org.apache.log4j.Logger; @@ -37,7 +38,9 @@ public class WrapperTranslations { /* * Properties */ + @JsonProperty("id") private int id; + @JsonProperty("translations") private List translations; //