Simplify MsoHeatEnvironmentParameter methods

Change-Id: I199008128f28903ea28ecfba437511c4c4a6c8e7
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameter.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameter.java
index 4cf9023..7444e1c 100644 (file)
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameter.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameter.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.mso.openstack.utils;
 
-
+import java.util.Objects;
 
 public class MsoHeatEnvironmentParameter {
 
@@ -66,20 +66,11 @@ public class MsoHeatEnvironmentParameter {
                }
                MsoHeatEnvironmentParameter hep = (MsoHeatEnvironmentParameter) o;      
                // If the name of the parameter is the same, then they're equal
-               if (hep.getName().equals(this.getName())) {
-                       return true;
-               }
-               return false;
+        return hep.getName().equals(this.getName());
        }
        
        public int hashCode() {
-               int result = 0;
-               try {
-                       result = this.name.hashCode();
-               } catch (Exception e) {
-                       // in case it's null - return zero
-               }
-               return result;
+        return Objects.hashCode(this.name);
        }