From c95fb17f6e6a267f8481b826d4824625410e31e3 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 1 Jun 2020 13:18:15 +0200 Subject: [PATCH] minor: simplify hashCode() in CenterDomain --- .../integrationtests/common/CenterDomain.java | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java index eba7b823f..6e6223056 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java @@ -29,23 +29,24 @@ public class CenterDomain implements Comparable { private final static Logger LOG = LoggerFactory.getLogger(CenterDomain.class); public static class Builder { - private Integer id; - private String accountNo; - private HashMap status; - private boolean active; - private String name; - private String externalId; - private Integer staffId; - private Integer officeId; - private String officeName; - private String hierarchy; - private ArrayList groupMembers; + private final Integer id; + private final String accountNo; + private final HashMap status; + private final boolean active; + private final String name; + private final String externalId; + private final Integer staffId; + private final Integer officeId; + private final String officeName; + private final String hierarchy; + private final ArrayList groupMembers; private Builder(final Integer id, final Integer statusid, final String statuscode, final String statusvalue, final boolean active, final String name, final String externalId, final Integer staffId, final int officeID, final String officeName, final String hierarchy, final ArrayList groupMembers) { this.id = id; - this.status = new HashMap(); + this.accountNo = null; + this.status = new HashMap<>(); this.status.put("id", statusid); this.status.put("code", statuscode); this.status.put("value", statusvalue); @@ -88,7 +89,7 @@ public class CenterDomain implements Comparable { final String hierarchy, final ArrayList groupMembers) { this.id = id; this.accountNo = accountNo; - this.status = new HashMap(); + this.status = new HashMap<>(); this.status.put("id", statusid); this.status.put("code", statuscode); this.status.put("value", statusvalue); @@ -230,15 +231,7 @@ public class CenterDomain implements Comparable { hash += this.id; } if (this.status != null) { - if ((Double) this.status.get("id") >= 0) { - hash = (int) (hash + (Double) this.status.get("id")); - } - if ((String) this.status.get("code") != null) { - hash += this.status.get("code").hashCode(); - } - if ((String) this.status.get("value") != null) { - hash += this.status.get("value").hashCode(); - } + hash += this.status.hashCode(); } if (this.name != null) { hash += this.name.hashCode();