From 00bdfaf6a72209a45b23c71751f9f5f6f3e06fbc Mon Sep 17 00:00:00 2001 From: Stuart Boston Date: Thu, 22 Aug 2013 13:13:25 +0100 Subject: [PATCH] Add missing properties to MovieDbList Tidy up other code --- .../omertron/themoviedbapi/TheMovieDbApi.java | 3 ++- .../omertron/themoviedbapi/model/MovieDb.java | 19 ++++++++------ .../themoviedbapi/model/MovieDbList.java | 25 ++++++++++++++++++- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java index 389c231ca..9408bc656 100644 --- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java +++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java @@ -1076,8 +1076,8 @@ public class TheMovieDbApi { throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex); } } - // + // /** * This method is used to retrieve all of the basic information about a movie collection. @@ -1818,6 +1818,7 @@ public class TheMovieDbApi { throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex); } } + // // /** diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java index 9976f28c5..e9a4c05ed 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java +++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java @@ -197,6 +197,10 @@ public class MovieDb extends AbstractJsonMapping { public String getStatus() { return status; } + + public float getUserRating() { + return userRating; + } // // @@ -292,7 +296,11 @@ public class MovieDb extends AbstractJsonMapping { this.status = status; } + public void setUserRating(float userRating) { + this.userRating = userRating; + } // + // public List getAlternativeTitles() { return alternativeTitles.getTitles(); @@ -337,6 +345,7 @@ public class MovieDb extends AbstractJsonMapping { public List getReviews() { return reviews.getReviews(); } + // // public void setAlternativeTitles(WrapperAlternativeTitles alternativeTitles) { @@ -378,6 +387,7 @@ public class MovieDb extends AbstractJsonMapping { public void setReviews(WrapperReviews reviews) { this.reviews = reviews; } + // // @Override @@ -409,12 +419,5 @@ public class MovieDb extends AbstractJsonMapping { hash = 89 * hash + this.runtime; return hash; } - - public float getUserRating() { - return userRating; - } - - public void setUserRating(float userRating) { - this.userRating = userRating; - } + // } diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java index 3f7689577..c41ee6fbb 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java +++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java @@ -29,7 +29,7 @@ import java.util.List; * * @author stuart.boston */ -public class MovieDbList { +public class MovieDbList extends AbstractJsonMapping { /* * Properties @@ -52,6 +52,10 @@ public class MovieDbList { private String name; @JsonProperty("poster_path") private String posterPath; + @JsonProperty("status_code") + private String statusCode; + @JsonProperty("status_message") + private String statusMessage; // public String getId() { @@ -90,6 +94,16 @@ public class MovieDbList { return posterPath; } + public String getStatusCode() { + return statusCode; + } + + public String getStatusMessage() { + return statusMessage; + } + // + + // public void setId(String id) { this.id = id; } @@ -125,4 +139,13 @@ public class MovieDbList { public void setPosterPath(String posterPath) { this.posterPath = posterPath; } + + public void setStatusCode(String statusCode) { + this.statusCode = statusCode; + } + + public void setStatusMessage(String statusMessage) { + this.statusMessage = statusMessage; + } + // }