From: Gary Wu <gary.i.wu@huawei.com>
Date: Mon, 10 Apr 2017 22:40:00 +0000 (-0700)
Subject: Simplify MsoHeatEnvironmentParameter methods
X-Git-Tag: v1.1.0~426^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6a6fdac2d81cd38390c11cfbb81ec0168665cfea;p=so.git

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 4cf9023b7c..7444e1c881 100644
--- 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);
 	}