diff --git a/src/main/java/com/omertron/themoviedbapi/model/Language.java b/src/main/java/com/omertron/themoviedbapi/model/Language.java index 7301ba028..05ee4a5fb 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Language.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Language.java @@ -34,20 +34,20 @@ public class Language extends AbstractJsonMapping implements Serializable { private static final long serialVersionUID = 100L; @JsonProperty("iso_639_1") - private String isoCode; + private String language; @JsonProperty("name") private String name; - public String getIsoCode() { - return isoCode; + public String getLanguage() { + return language; } public String getName() { return name; } - public void setIsoCode(String isoCode) { - this.isoCode = isoCode; + public void setLanguage(String language) { + this.language = language; } public void setName(String name) { @@ -59,7 +59,7 @@ public class Language extends AbstractJsonMapping implements Serializable { if (obj instanceof Language) { final Language other = (Language) obj; return new EqualsBuilder() - .append(isoCode, other.isoCode) + .append(language, other.language) .append(name, other.name) .isEquals(); } else { @@ -70,7 +70,7 @@ public class Language extends AbstractJsonMapping implements Serializable { @Override public int hashCode() { return new HashCodeBuilder() - .append(isoCode) + .append(language) .append(name) .toHashCode(); } diff --git a/src/main/java/com/omertron/themoviedbapi/model/media/Translation.java b/src/main/java/com/omertron/themoviedbapi/model/media/Translation.java index 00128bf79..e5f762381 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/media/Translation.java +++ b/src/main/java/com/omertron/themoviedbapi/model/media/Translation.java @@ -37,42 +37,42 @@ public class Translation extends AbstractJsonMapping implements Serializable { @JsonProperty("english_name") private String englishName; @JsonProperty("iso_639_1") - private String isoCode; + private String language; @JsonProperty("name") private String name; @JsonProperty("iso_3166_1") - private String language; + private String country; public String getEnglishName() { return englishName; } - public String getIsoCode() { - return isoCode; - } - - public String getName() { - return name; - } - public String getLanguage() { return language; } + public String getName() { + return name; + } + + public String getCountry() { + return country; + } + public void setEnglishName(String englishName) { this.englishName = englishName; } - public void setIsoCode(String isoCode) { - this.isoCode = isoCode; + public void setLanguage(String language) { + this.language = language; } public void setName(String name) { this.name = name; } - public void setLanguage(String language) { - this.language = language; + public void setCountry(String country) { + this.country = country; } @Override @@ -82,7 +82,7 @@ public class Translation extends AbstractJsonMapping implements Serializable { return new EqualsBuilder() .append(name, other.name) .append(englishName, other.englishName) - .append(isoCode, other.isoCode) + .append(language, other.language) .isEquals(); } else { return false; @@ -93,7 +93,7 @@ public class Translation extends AbstractJsonMapping implements Serializable { public int hashCode() { return new HashCodeBuilder() .append(englishName) - .append(isoCode) + .append(language) .append(name) .toHashCode(); }