diff --git a/src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCountry.java b/src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCountry.java index a7f0b6e9f..b6e06337f 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCountry.java +++ b/src/main/java/com/omertron/themoviedbapi/model/movie/ProductionCountry.java @@ -34,22 +34,22 @@ public class ProductionCountry extends AbstractJsonMapping { private static final long serialVersionUID = 1L; @JsonProperty("iso_3166_1") - private String isoCode; + private String country; @JsonProperty("name") private String name; - public String getIsoCode() { - return isoCode; + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; } public String getName() { return name; } - public void setIsoCode(String isoCode) { - this.isoCode = isoCode; - } - public void setName(String name) { this.name = name; } @@ -60,7 +60,7 @@ public class ProductionCountry extends AbstractJsonMapping { final ProductionCountry other = (ProductionCountry) obj; return new EqualsBuilder() .append(name, other.name) - .append(isoCode, other.isoCode) + .append(country, other.country) .isEquals(); } else { return false; @@ -70,7 +70,7 @@ public class ProductionCountry extends AbstractJsonMapping { @Override public int hashCode() { return new HashCodeBuilder() - .append(isoCode) + .append(country) .append(name) .toHashCode(); } diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/ContentRating.java b/src/main/java/com/omertron/themoviedbapi/model/person/ContentRating.java index 68e405496..24ad7a282 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/person/ContentRating.java +++ b/src/main/java/com/omertron/themoviedbapi/model/person/ContentRating.java @@ -28,16 +28,16 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class ContentRating { @JsonProperty("iso_3166_1") - private String language; + private String country; @JsonProperty("rating") private String rating; - public String getLanguage() { - return language; + public String getCountry() { + return country; } - public void setLanguage(String language) { - this.language = language; + public void setCountry(String country) { + this.country = country; } public String getRating() { diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java index 44b93990d..0f38812e0 100644 --- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java +++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbTVTest.java @@ -170,7 +170,7 @@ public class TmdbTVTest extends AbstractTests { for (TestID test : TV_IDS) { ResultList result = instance.getTVContentRatings(test.getTmdb()); TestSuite.test(result, "TV Content Rating"); - assertTrue("No language", StringUtils.isNotBlank(result.getResults().get(0).getLanguage())); + assertTrue("No language", StringUtils.isNotBlank(result.getResults().get(0).getCountry())); assertTrue("No rating", StringUtils.isNotBlank(result.getResults().get(0).getRating())); } }