From: Dominik Mizyn <d.mizyn@samsung.com>
Date: Thu, 30 May 2019 07:12:24 +0000 (+0200)
Subject: Fix sonar issue: Override "equals(Object obj)"
X-Git-Tag: 3.2.0~297^2~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c5b960eaa66fcfdd69c4a8201d2c0ff8ee1253a8;p=portal.git

Fix sonar issue: Override "equals(Object obj)"

This commit provide equals method for CentralV2UserApp and test for this method.

Issue-ID: PORTAL-599
Change-Id: Ied44c680032831ec6a02211f658ec16f0aad8f4a
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
---

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2UserApp.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2UserApp.java
index 2ada8ed1..17007a5f 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2UserApp.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralV2UserApp.java
@@ -38,6 +38,7 @@
 package org.onap.portalapp.portal.transport;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 @SuppressWarnings("rawtypes")
 public class CentralV2UserApp implements Serializable, Comparable{
@@ -99,7 +100,20 @@ public class CentralV2UserApp implements Serializable, Comparable{
 		this.priority = priority;
 	}
 
-
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof CentralV2UserApp)) {
+			return false;
+		}
+		CentralV2UserApp castOther = (CentralV2UserApp) other;
+		return Objects.equals(this.userId, castOther.userId) &&
+			Objects.equals(this.app, castOther.app) &&
+			Objects.equals(this.role, castOther.role) &&
+			Objects.equals(this.priority, castOther.priority);
+	}
 
 	public int compareTo(Object other){
 	    CentralV2UserApp castOther = (CentralV2UserApp) other;
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
index 6340eb92..a41cbd82 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
@@ -117,6 +117,18 @@ public class CentralUserAppTest {
         assertEquals(centralV2UserApp.getApp(), app1);
         assertEquals(centralV2UserApp.getRole(), role1);
     }
+
+    @Test
+	public void centralUserAppEqualsTest(){
+		CentralV2UserApp centralV2UserApp = mockCentralUserApp();
+		CentralV2UserApp centralV2UserApp2 = mockCentralUserApp();
+
+		assertTrue(centralV2UserApp.equals(centralV2UserApp));
+		assertTrue(centralV2UserApp.equals(centralV2UserApp2));
+		assertFalse(centralV2UserApp.equals(new Long(1)));
+		centralV2UserApp2.setPriority(213);
+		assertFalse(centralV2UserApp.equals(centralV2UserApp2));
+	}
 	
 	@Test
 	public void unt_hashCodeTest(){