Revision 986f6827
Added by Andreas Müller almost 6 years ago
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/validation/Employee.java | ||
---|---|---|
27 | 27 |
public class Employee extends CdmBase { |
28 | 28 |
|
29 | 29 |
@CheckCase(value = CaseMode.UPPER, groups = { Level2.class }) |
30 |
private String firstName;
|
|
30 |
private String givenName;
|
|
31 | 31 |
@CheckCase(value = CaseMode.UPPER, groups = { Level3.class }) |
32 |
private String lastName;
|
|
32 |
private String familyName;
|
|
33 | 33 |
@Valid |
34 | 34 |
private Company company; |
35 | 35 |
@Valid |
... | ... | |
38 | 38 |
public Employee() { |
39 | 39 |
} |
40 | 40 |
|
41 |
public String getFirstName() {
|
|
42 |
return firstName;
|
|
41 |
public String getGivenName() {
|
|
42 |
return givenName;
|
|
43 | 43 |
} |
44 | 44 |
|
45 |
public void setFirstName(String firstName) {
|
|
46 |
this.firstName = firstName;
|
|
45 |
public void setGivenName(String givenName) {
|
|
46 |
this.givenName = givenName;
|
|
47 | 47 |
} |
48 | 48 |
|
49 |
public String getLastName() {
|
|
50 |
return lastName;
|
|
49 |
public String getFamilyName() {
|
|
50 |
return familyName;
|
|
51 | 51 |
} |
52 | 52 |
|
53 |
public void setLastName(String lastName) {
|
|
54 |
this.lastName = lastName;
|
|
53 |
public void setFamilyName(String familyName) {
|
|
54 |
this.familyName = familyName;
|
|
55 | 55 |
} |
56 | 56 |
|
57 | 57 |
public Company getCompany() { |
... | ... | |
79 | 79 |
return false; |
80 | 80 |
} |
81 | 81 |
Employee emp = (Employee) obj; |
82 |
return firstName.equals(emp.firstName) && lastName.equals(emp.lastName);
|
|
82 |
return givenName.equals(emp.givenName) && familyName.equals(emp.familyName);
|
|
83 | 83 |
} |
84 | 84 |
|
85 | 85 |
@Override |
86 | 86 |
public int hashCode() { |
87 | 87 |
int hash = 17; |
88 |
hash = (hash * 31) + (firstName == null ? 0 : firstName.hashCode());
|
|
89 |
hash = (hash * 31) + (lastName == null ? 0 : lastName.hashCode());
|
|
88 |
hash = (hash * 31) + (givenName == null ? 0 : givenName.hashCode());
|
|
89 |
hash = (hash * 31) + (familyName == null ? 0 : familyName.hashCode());
|
|
90 | 90 |
return hash; |
91 | 91 |
} |
92 | 92 |
|
Also available in: Unified diff
ref #7238 rename lastName and firstName