Add equals & hascode methods

Override "equals(Object obj)" to comply with the contract of the "compareTo(T o)" method
Either log or rethrow this exception

Issue-ID: PORTAL-562
Change-Id: Ied48f77e47fcd697648e9f76b0100e9936ee214e
Signed-off-by: Parshad Patel <pars.patel@samsung.com>

diff --git a/portal-BE/src/main/java/org/onap/portal/aop/service/FnUserServiceAOP.java b/portal-BE/src/main/java/org/onap/portal/aop/service/FnUserServiceAOP.java
index 84f430e..b96575c 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/aop/service/FnUserServiceAOP.java
+++ b/portal-BE/src/main/java/org/onap/portal/aop/service/FnUserServiceAOP.java
@@ -82,6 +82,7 @@ public class FnUserServiceAOP {
               try {
                      user = fnUserMapper.fnUserToFnUser(fnUser);
               } catch (NullPointerException e) {
+                  LOGGER.error("NullPointerException occured", e);
                      throw new NullPointerException(e.getLocalizedMessage() + ", " + e.getMessage());
               }
 

diff --git a/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java b/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
index 90ea068..c545d7f 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
+++ b/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
@@ -111,6 +111,7 @@ public class LanguageController {
                             response.setStatus(PortalRestStatusEnum.ERROR);
                      }
               } catch (Exception e) {
+                     LOGGER.error("Exception in setUpUserLanguage", e);
                      response.setMessage("FAILURE");
                      response.setResponse(e.toString());
                      response.setStatus(PortalRestStatusEnum.ERROR);
@@ -136,6 +137,7 @@ public class LanguageController {
                      response.setResponse(languageService.save(principal, fnLanguage).toString());
                      response.setStatus(PortalRestStatusEnum.OK);
               } catch (Exception e) {
+                     LOGGER.error("Exception in saveLanguage", e);
                      response.setMessage("FAILURE");
                      response.setResponse(e.getMessage());
                      response.setStatus(PortalRestStatusEnum.ERROR);

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java
index 69ff4a2..8cc3a5a 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/CentralV2UserApp.java
@@ -41,6 +41,7 @@
 package org.onap.portal.domain.dto.transport;
 
 import java.io.Serializable;
+import java.util.Objects;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -50,23 +51,49 @@ import lombok.Setter;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class CentralV2UserApp implements Serializable, Comparable{
+public class CentralV2UserApp implements Serializable, Comparable {
 
-       private static final long serialVersionUID = 4954830080839125389L;
+    private static final long serialVersionUID = 4954830080839125389L;
 
-       private Long userId;
-       private CentralApp app;
-       private CentralV2Role role;
-       private Integer priority;
+    private Long userId;
+    private CentralApp app;
+    private CentralV2Role role;
+    private Integer priority;
 
-       public int compareTo(Object other){
-           CentralV2UserApp castOther = (CentralV2UserApp) other;
+    public int compareTo(Object other) {
+        CentralV2UserApp castOther = (CentralV2UserApp) other;
 
         Long c1 = (this.getUserId() == null ? 0 : this.getUserId()) + (this.priority == null ? 0 : this.priority);
         Long c2 = (castOther.getUserId() == null ? 0 : castOther.getUserId());
         c2 += (castOther.getApp() == null || castOther.getApp().getId() == null ? 0 : castOther.getApp().getId());
         c2 += (castOther.priority == null ? 0 : castOther.priority);
 
-           return c1.compareTo(c2);
-       }
+        return c1.compareTo(c2);
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((app == null) ? 0 : app.hashCode());
+        result = prime * result + ((priority == null) ? 0 : priority.hashCode());
+        result = prime * result + ((role == null) ? 0 : role.hashCode());
+        result = prime * result + ((userId == null) ? 0 : userId.hashCode());
+        return result;
+    }
+
+    @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);
+    }
 }

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPerms.java b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPerms.java
index e963fe4..1358233 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPerms.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/dto/transport/ExternalAccessPerms.java
@@ -50,29 +50,80 @@ import lombok.Setter;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class ExternalAccessPerms implements Serializable, Comparable{
+public class ExternalAccessPerms implements Serializable, Comparable {
 
-       private static final long serialVersionUID = -200964838466882602L;
+    private static final long serialVersionUID = -200964838466882602L;
 
-       private String type;
-       private String instance;
-       private String action;
-       private String description;
+    private String type;
+    private String instance;
+    private String action;
+    private String description;
 
-       public ExternalAccessPerms(String type, String instance, String action) {
-               this.type = type;
-               this.instance = instance;
-               this.action = action;
-       }
+    public ExternalAccessPerms(String type, String instance, String action) {
+        this.type = type;
+        this.instance = instance;
+        this.action = action;
+    }
 
-       @Override
-       public int compareTo(Object obj){
-       ExternalAccessPerms other = (ExternalAccessPerms)obj;
+    @Override
+    public int compareTo(Object obj) {
+        ExternalAccessPerms other = (ExternalAccessPerms) obj;
 
-       String c1 = getInstance();
-       String c2 = other.getInstance();
+        String c1 = getInstance();
+        String c2 = other.getInstance();
 
-       return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2);
-       }
+        return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2);
+    }
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((action == null) ? 0 : action.hashCode());
+        result = prime * result + ((description == null) ? 0 : description.hashCode());
+        result = prime * result + ((instance == null) ? 0 : instance.hashCode());
+        result = prime * result + ((type == null) ? 0 : type.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        ExternalAccessPerms other = (ExternalAccessPerms) obj;
+        if (action == null) {
+            if (other.action != null)
+                return false;
+        } else if (!action.equals(other.action)) {
+            return false;
+        }
+        if (description == null) {
+            if (other.description != null)
+                return false;
+        } else if (!description.equals(other.description)) {
+            return false;
+        }
+        if (instance == null) {
+            if (other.instance != null) {
+                return false;
+            }
+        } else if (!instance.equals(other.instance)) {
+            return false;
+        }
+        if (type == null) {
+            if (other.type != null) {
+                return false;
+            }
+        } else if (!type.equals(other.type)) {
+            return false;
+        }
+        return true;
+    }
 }