From ca4fc59a803c3c0c66bd965ba748712eaf7dde66 Mon Sep 17 00:00:00 2001 From: Stuart Boston Date: Thu, 24 Mar 2016 20:53:16 +0000 Subject: [PATCH] Rename language field A field should not duplicate the name of its containing class --- .../com/omertron/themoviedbapi/model/Language.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/omertron/themoviedbapi/model/Language.java b/src/main/java/com/omertron/themoviedbapi/model/Language.java index 05ee4a5fb..82879a57e 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 language; + private String code; @JsonProperty("name") private String name; - public String getLanguage() { - return language; + public String getCode() { + return code; } public String getName() { return name; } - public void setLanguage(String language) { - this.language = language; + public void setCode(String code) { + this.code = code; } 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(language, other.language) + .append(code, other.code) .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(language) + .append(code) .append(name) .toHashCode(); }