Skip to content

Commit

Permalink
Merge pull request #476 from gchq/PAL-185-Employee-object-functions
Browse files Browse the repository at this point in the history 
PAL 185 - Added .clone() .equals() .hashCode() methods to hr-generator types
  • Loading branch information
@m09526
m09526 authored Oct 16, 2019
2 parents 5fe1f00 + 37bc5a2 commit 88a0685
Show file tree
Hide file tree
Showing 8 changed files with 465 additions and 2 deletions.
46 changes: 45 additions & 1 deletion ...a-generator/src/main/java/uk/gov/gchq/palisade/example/hrdatagenerator/types/Address.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,30 @@
package uk.gov.gchq.palisade.example.hrdatagenerator.types;

import com.github.javafaker.Faker;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

import java.util.Random;

public class Address {

private String streetAddressNumber;
private String streetName;
private String city;
private String state;
private String zipCode;

public Address() {
}

public Address(final Address address) {
streetAddressNumber = address.streetAddressNumber;
streetName = address.streetName;
city = address.city;
state = address.state;
zipCode = address.zipCode;
}

public static Address generate(final Faker faker, final Random random) {
Address address = new Address();
com.github.javafaker.Address fakeAddress = faker.address();
Expand Down Expand Up @@ -90,4 +102,36 @@ public String toString() {
.append("zipCode", zipCode)
.toString();
}

@Override
public boolean equals(final Object o) {
if (this == o) {
return true;
}

if (o == null || getClass() != o.getClass()) {
return false;
}

final Address address = (Address) o;

return new EqualsBuilder()
.append(streetAddressNumber, address.streetAddressNumber)
.append(streetName, address.streetName)
.append(city, address.city)
.append(state, address.state)
.append(zipCode, address.zipCode)
.isEquals();
}

@Override
public int hashCode() {
return new HashCodeBuilder(11, 41)
.append(streetAddressNumber)
.append(streetName)
.append(city)
.append(state)
.append(zipCode)
.toHashCode();
}
}
36 changes: 36 additions & 0 deletions ...nerator/src/main/java/uk/gov/gchq/palisade/example/hrdatagenerator/types/BankDetails.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package uk.gov.gchq.palisade.example.hrdatagenerator.types;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

import java.util.Random;
Expand All @@ -24,6 +26,14 @@ public class BankDetails {
private String sortCode;
private String accountNumber;

public BankDetails() {
}

public BankDetails(final BankDetails bankDetails) {
sortCode = bankDetails.sortCode;
accountNumber = bankDetails.accountNumber;
}

public static BankDetails generate(final Random random) {
BankDetails bankDetails = new BankDetails();
StringBuilder sortCode = new StringBuilder(String.valueOf(random.nextInt(999999)));
Expand Down Expand Up @@ -62,5 +72,31 @@ public String toString() {
.append("accountNumber", accountNumber)
.toString();
}

@Override
public boolean equals(final Object o) {
if (this == o) {
return true;
}

if (o == null || getClass() != o.getClass()) {
return false;
}

final BankDetails bankDetails = (BankDetails) o;

return new EqualsBuilder()
.append(sortCode, bankDetails.sortCode)
.append(accountNumber, bankDetails.accountNumber)
.isEquals();
}

@Override
public int hashCode() {
return new HashCodeBuilder(15, 45)
.append(sortCode)
.append(accountNumber)
.toHashCode();
}
}

49 changes: 49 additions & 0 deletions ...or/src/main/java/uk/gov/gchq/palisade/example/hrdatagenerator/types/EmergencyContact.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import com.github.javafaker.Faker;
import com.github.javafaker.Name;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

import java.util.Random;
Expand All @@ -27,6 +29,25 @@ public class EmergencyContact {
private Relation relation;
private PhoneNumber[] contactNumbers;

public EmergencyContact() {
}

public EmergencyContact(final EmergencyContact emergencyContact) {
contactName = emergencyContact.contactName;
relation = emergencyContact.relation;

// Nested
if (emergencyContact.contactNumbers != null) {
int arrayLen = emergencyContact.contactNumbers.length;
contactNumbers = new PhoneNumber[arrayLen];
for (int i = 0; i < arrayLen; i++) {
if (emergencyContact.contactNumbers[i] != null) {
contactNumbers[i] = new PhoneNumber(emergencyContact.contactNumbers[i]);
}
}
}
}

public static EmergencyContact generate(final Faker faker, final Random random) {
EmergencyContact contact = new EmergencyContact();
Name tempName = faker.name();
Expand Down Expand Up @@ -79,4 +100,32 @@ public String toString() {
.append("contactNumbers", contactNumbers)
.toString();
}

@Override
public boolean equals(final Object o) {
if (this == o) {
return true;
}

if (o == null || getClass() != o.getClass()) {
return false;
}

final EmergencyContact emergencyContact = (EmergencyContact) o;

return new EqualsBuilder()
.append(contactName, emergencyContact.contactName)
.append(relation, emergencyContact.relation)
.append(contactNumbers, emergencyContact.contactNumbers)
.isEquals();
}

@Override
public int hashCode() {
return new HashCodeBuilder(15, 47)
.append(contactName)
.append(relation)
.append(contactNumbers)
.toHashCode();
}
}
117 changes: 116 additions & 1 deletion ...-generator/src/main/java/uk/gov/gchq/palisade/example/hrdatagenerator/types/Employee.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import com.github.javafaker.Faker;
import com.github.javafaker.Name;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

import uk.gov.gchq.palisade.UserId;
Expand All @@ -26,7 +28,6 @@
import java.util.Random;

public class Employee {

private UserId uid;
private String name;
private String dateOfBirth;
Expand All @@ -45,6 +46,64 @@ public class Employee {
private WorkLocation workLocation;
private Sex sex;

public Employee() {
}

public Employee(final Employee employee) {
name = employee.name;
dateOfBirth = employee.dateOfBirth;
taxCode = employee.taxCode;
nationality = employee.nationality;
hireDate = employee.hireDate;
grade = employee.grade;
department = employee.department;
salaryAmount = employee.salaryAmount;
salaryBonus = employee.salaryBonus;
sex = employee.sex;

if (employee.uid != null) {
uid = employee.uid.clone();
}

if (employee.address != null) {
address = new Address(employee.address);
}
if (employee.bankDetails != null) {
bankDetails = new BankDetails(employee.bankDetails);
}
if (employee.workLocation != null) {
workLocation = new WorkLocation(employee.workLocation);
}

// Nested
if (employee.contactNumbers != null) {
int arrayLen = employee.contactNumbers.length;
contactNumbers = new PhoneNumber[arrayLen];
for (int i = 0; i < arrayLen; i++) {
if (employee.contactNumbers[i] != null) {
contactNumbers[i] = new PhoneNumber(employee.contactNumbers[i]);
}
}
}
if (employee.emergencyContacts != null) {
int arrayLen = employee.emergencyContacts.length;
emergencyContacts = new EmergencyContact[arrayLen];
for (int i = 0; i < arrayLen; i++) {
if (employee.emergencyContacts[i] != null) {
emergencyContacts[i] = new EmergencyContact(employee.emergencyContacts[i]);
}
}
}
if (employee.manager != null) {
int arrayLen = employee.manager.length;
manager = new Manager[arrayLen];
for (int i = 0; i < arrayLen; i++) {
if (employee.manager[i] != null) {
manager[i] = new Manager(employee.manager[i]);
}
}
}
}

public static Employee generate(final Random random) {
Employee employee = new Employee();
Expand Down Expand Up @@ -233,4 +292,60 @@ public String toString() {
.append("sex", sex)
.toString();
}

@Override
public boolean equals(final Object o) {
if (this == o) {
return true;
}

if (o == null || getClass() != o.getClass()) {
return false;
}

final Employee employee = (Employee) o;

return new EqualsBuilder()
.append(uid, employee.uid)
.append(name, employee.name)
.append(dateOfBirth, employee.dateOfBirth)
.append(contactNumbers, employee.contactNumbers)
.append(emergencyContacts, employee.emergencyContacts)
.append(address, employee.address)
.append(bankDetails, employee.bankDetails)
.append(taxCode, employee.taxCode)
.append(nationality, employee.nationality)
.append(manager, employee.manager)
.append(hireDate, employee.hireDate)
.append(grade, employee.grade)
.append(department, employee.department)
.append(salaryAmount, employee.salaryAmount)
.append(salaryBonus, employee.salaryBonus)
.append(workLocation, employee.workLocation)
.append(sex, employee.sex)
.isEquals();
}

@Override
public int hashCode() {
return new HashCodeBuilder(7, 45)
.append(uid)
.append(name)
.append(dateOfBirth)
.append(contactNumbers)
.append(emergencyContacts)
.append(address)
.append(bankDetails)
.append(taxCode)
.append(nationality)
.append(manager)
.append(hireDate)
.append(grade)
.append(department)
.append(salaryAmount)
.append(salaryBonus)
.append(workLocation)
.append(sex)
.toHashCode();
}
}
Loading

0 comments on commit 88a0685

Please sign in to comment.