From 0defe5112010238bffdbc52199b35163cb0999ee Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Tue, 21 Apr 2020 20:49:29 -0400 Subject: [PATCH] Add hashCode() methods to two classes for Sonar Trying to lift the Dashboard score out of the basement. Change-Id: I2f8523079fcdf0ec614908063f4417c0b35352e6 Signed-off-by: Lott, Christopher (cl778h) --- .../java/org/oransc/ric/portal/dashboard/model/AppStats.java | 9 +++++++++ .../ric/portal/dashboard/model/StatsDetailsTransport.java | 11 +++++++++++ .../java/org/oransc/ric/portal/dashboard/model/ModelTest.java | 1 + 3 files changed, 21 insertions(+) diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/AppStats.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/AppStats.java index 1bf6b97d..8a12bf82 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/AppStats.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/AppStats.java @@ -68,4 +68,13 @@ public class AppStats implements IDashboardResponse { return Objects.equals(instanceKey, other.instanceKey) && Objects.equals(statsDetails, other.statsDetails); } + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((instanceKey == null) ? 0 : instanceKey.hashCode()); + result = prime * result + ((statsDetails == null) ? 0 : statsDetails.hashCode()); + return result; + } + } diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/StatsDetailsTransport.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/StatsDetailsTransport.java index 847fdcbb..b3e1c69a 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/StatsDetailsTransport.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/StatsDetailsTransport.java @@ -75,4 +75,15 @@ public class StatsDetailsTransport implements IDashboardResponse { StatsDetailsTransport other = (StatsDetailsTransport) obj; return appId == other.appId; } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + appId; + result = prime * result + ((appName == null) ? 0 : appName.hashCode()); + result = prime * result + ((metricUrl == null) ? 0 : metricUrl.hashCode()); + return result; + } + } diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java index 88bcf990..78458d01 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java @@ -55,6 +55,7 @@ public class ModelTest extends AbstractModelTest { m.setInstanceKey(s1); m.setStatsDetails(n); checkAppStats(m); + Assert.assertNotEquals(1, m.hashCode()); logger.info(m.toString()); } -- 2.16.6