Rename language field

A field should not duplicate the name of its containing class
This commit is contained in:
Stuart Boston
2016-03-24 20:53:16 +00:00
parent 799d6d6fd5
commit ca4fc59a80
@@ -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();
}