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

Refactored to use a base class

Browse Source
This commit is contained in:
Omertron
2013-02-03 19:25:23 +00:00
parent 596cde7621
commit 1e45b87508
11 changed files with 157 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperBase.java
+105
View File
@@ -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 <http://www.gnu.org/licenses/>.
*
*/
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;
}
//<editor-fold defaultstate="collapsed" desc="Getter Methods">
public int getId() {
return id;
}
public int getPage() {
return page;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalResults() {
return totalResults;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter Methods">
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;
}
//</editor-fold>
/**
* 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());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java
+3 -54
View File
@@ -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<Collection> results;
@JsonProperty("total_pages")
private int totalPages;
@JsonProperty("total_results")
private int totalResults;
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public int getPage() {
return page;
public WrapperCollection() {
super(Logger.getLogger(WrapperCollection.class));
}
public List<Collection> getResults() {
return results;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalResults() {
return totalResults;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter methods">
public void setPage(int page) {
this.page = page;
}
public void setResults(List<Collection> results) {
this.results = results;
}
public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}
public void setTotalResults(int totalResults) {
this.totalResults = totalResults;
}
//</editor-fold>
/**
* 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());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java
+3 -52
View File
@@ -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<Company> results;
@JsonProperty("total_pages")
private int totalPages;
@JsonProperty("total_results")
private int totalResults;
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public int getPage() {
return page;
public WrapperCompany() {
super(Logger.getLogger(WrapperCompany.class));
}
public List<Company> getResults() {
return results;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalResults() {
return totalResults;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter methods">
public void setPage(int page) {
this.page = page;
}
public void setResults(List<Company> results) {
this.results = results;
}
public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}
public void setTotalResults(int totalResults) {
this.totalResults = totalResults;
}
//</editor-fold>
/**
* 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());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java
+9 -64
View File
@@ -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<MovieDb> results;
@JsonProperty("total_pages")
private int totalPages;
@JsonProperty("total_results")
private int totalResults;
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public int getCompanyId() {
return companyId;
}
public int getPage() {
return page;
public WrapperCompanyMovies() {
super(Logger.getLogger(WrapperCompanyMovies.class));
}
public List<MovieDb> getResults() {
return results;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalResults() {
return totalResults;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter methods">
public void setCompanyId(int companyId) {
this.companyId = companyId;
}
public void setPage(int page) {
this.page = page;
}
public void setResults(List<MovieDb> results) {
this.results = results;
}
public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}
public void setTotalResults(int totalResults) {
this.totalResults = totalResults;
}
//</editor-fold>
/**
* 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();
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java
+4 -30
View File
@@ -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<Artwork> backdrops;
@JsonProperty("posters")
@@ -47,11 +39,11 @@ public class WrapperImages {
@JsonProperty("profiles")
private List<Artwork> profiles;
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public int getId() {
return id;
public WrapperImages() {
super(Logger.getLogger(WrapperImages.class));
}
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public List<Artwork> getBackdrops() {
return backdrops;
}
@@ -66,10 +58,6 @@ public class WrapperImages {
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter methods">
public void setId(int id) {
this.id = id;
}
public void setBackdrops(List<Artwork> backdrops) {
this.backdrops = backdrops;
}
@@ -82,18 +70,4 @@ public class WrapperImages {
this.profiles = profiles;
}
//</editor-fold>
/**
* 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());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java
+3 -54
View File
@@ -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<Keyword> results;
@JsonProperty("total_pages")
private int totalPages;
@JsonProperty("total_results")
private int totalResults;
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public int getPage() {
return page;
public WrapperKeywords() {
super(Logger.getLogger(WrapperKeywords.class));
}
public List<Keyword> getResults() {
return results;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalResults() {
return totalResults;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter methods">
public void setPage(int page) {
this.page = page;
}
public void setResults(List<Keyword> results) {
this.results = results;
}
public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}
public void setTotalResults(int totalResults) {
this.totalResults = totalResults;
}
//</editor-fold>
/**
* 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());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java
+11 -70
View File
@@ -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<MovieDb> movies;
@JsonProperty("total_pages")
private int totalPages;
@JsonProperty("total_results")
private int totalResults;
@JsonProperty("id")
private int id;
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public int getPage() {
return page;
public WrapperMovie() {
super(Logger.getLogger(WrapperMovie.class));
}
public List<MovieDb> getMovies() {
return movies;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalResults() {
return totalResults;
}
public int getId() {
return id;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter methods">
public void setPage(int page) {
this.page = page;
}
public void setMovies(List<MovieDb> 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;
}
//</editor-fold>
/**
* 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<MovieDb> 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();
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieList.java
+4 -64
View File
@@ -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> movieList;
@JsonProperty("total_pages")
private int totalPages;
@JsonProperty("total_results")
private int totalResults;
//<editor-fold defaultstate="collapsed" desc="Getter Methods">
public int getId() {
return id;
}
public int getPage() {
return page;
public WrapperMovieList() {
super(Logger.getLogger(WrapperMovieList.class));
}
public List<MovieList> getMovieList() {
return movieList;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalResults() {
return totalResults;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter Methods">
public void setId(int id) {
this.id = id;
}
public void setPage(int page) {
this.page = page;
}
public void setMovieList(List<MovieList> movieList) {
this.movieList = movieList;
}
public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}
public void setTotalResults(int totalResults) {
this.totalResults = totalResults;
}
//</editor-fold>
/**
* 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());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java
+3 -52
View File
@@ -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<Person> results;
@JsonProperty("total_pages")
private int totalPages;
@JsonProperty("total_results")
private int totalResults;
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public int getPage() {
return page;
public WrapperPerson() {
super(Logger.getLogger(WrapperPerson.class));
}
public List<Person> getResults() {
return results;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalResults() {
return totalResults;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter methods">
public void setPage(int page) {
this.page = page;
}
public void setResults(List<Person> results) {
this.results = results;
}
public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}
public void setTotalResults(int totalResults) {
this.totalResults = totalResults;
}
//</editor-fold>
/**
* 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());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java
+9 -38
View File
@@ -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<PersonCredit> cast;
@JsonProperty("crew")
private List<PersonCredit> crew;
//<editor-fold defaultstate="collapsed" desc="Getter methods">
public WrapperPersonCredits() {
super(Logger.getLogger(WrapperMovieCasts.class));
}
public List<PersonCredit> getCast() {
return cast;
}
public void setCast(List<PersonCredit> cast) {
this.cast = cast;
}
public List<PersonCredit> getCrew() {
return crew;
}
public int getId() {
return id;
}
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Setter methods">
public void setCast(List<PersonCredit> cast) {
this.cast = cast;
}
public void setCrew(List<PersonCredit> crew) {
this.crew = crew;
}
public void setId(int id) {
this.id = id;
}
//</editor-fold>
/**
* 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());
}
}
src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java
+3
View File
@@ -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<Translation> translations;
//<editor-fold defaultstate="collapsed" desc="Setter methods">