Adjust code for Sonar issues

Made non-functional updates to address static code analysis issues.
Update license header with simple double-quote characters.

Issue: PORTAL-72, PORTAL-90
Change-Id: Ic2c330daea07d721f0e6b350ebf03da97073f7ce
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 47 insertions, 54 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/NameValueId.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/NameValueId.java
index cc05ea3f..eef7c27a 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/NameValueId.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/NameValueId.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -39,74 +39,67 @@ package org.onap.portalsdk.core.domain.support;
 
 import java.io.Serializable;
 
-
 public class NameValueId implements Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 1L;
-    private String lab;
-    private String val;
-
-    public NameValueId() {
-    }
-
-    public NameValueId(String value, String label) {
-      setVal(value);
-      setLab(label);
-    }
-
-
-    public String getLab() {
-        return lab;
-    }
-
-
-    public String getVal() {
-        return val;
-    }
+	private String lab;
+	private String val;
 
+	public NameValueId() {
+		// No-arg constructor
+	}
 
-    public void setLab(String label) {
-        this.lab = label;
-    }
+	public NameValueId(String value, String label) {
+		setVal(value);
+		setLab(label);
+	}
 
+	public String getLab() {
+		return lab;
+	}
 
-    public void setVal(String value) {
-        this.val = value;
-    }
+	public String getVal() {
+		return val;
+	}
 
+	public void setLab(String label) {
+		this.lab = label;
+	}
 
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      }
+	public void setVal(String value) {
+		this.val = value;
+	}
 
-      if (o == null) {
-        return false;
-      }
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
 
-      if (!(o instanceof NameValueId)) {
-        return false;
-      }
+		if (o == null) {
+			return false;
+		}
 
-      final NameValueId nameValueId = (NameValueId)o;
+		if (!(o instanceof NameValueId)) {
+			return false;
+		}
 
-      if (!getVal().equals(nameValueId.getVal())) {
-        return false;
-      }
+		final NameValueId nameValueId = (NameValueId) o;
 
-      if (!getLab().equals(nameValueId.getLab())) {
-        return false;
-      }
+		if (!getVal().equals(nameValueId.getVal())) {
+			return false;
+		}
 
-      return true;
-    }
+		if (!getLab().equals(nameValueId.getLab())) {
+			return false;
+		}
 
+		return true;
+	}
 
-    public int hashCode() {
-      return getVal().hashCode();
-    }
+	@Override
+	public int hashCode() {
+		return getVal().hashCode();
+	}
 
 }