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, 19 insertions, 21 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/CollaborateList.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/CollaborateList.java
index 2f0c5d50..32828b78 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/CollaborateList.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/domain/support/CollaborateList.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,36 +39,34 @@ package org.onap.portalsdk.core.domain.support;
 
 import java.io.Serializable;
 import java.util.HashSet;
+import java.util.Set;
+
+public class CollaborateList implements Serializable {
 
-public class CollaborateList implements  Serializable {
-	
 	private static final long serialVersionUID = -4104440747626736243L;
-	private HashSet<String> userNameList = new HashSet<String>();
+	private HashSet<String> userNameList = new HashSet<>();
 	private static CollaborateList userListData = new CollaborateList();
-	private CollaborateList(){}
 
-	public static CollaborateList getInstance(){
+	private CollaborateList() {
+	}
+
+	public static CollaborateList getInstance() {
 		return userListData;
 	}
-	
-	public HashSet<String> getAllUserName(){
+
+	public Set<String> getAllUserName() {
 		return userNameList;
 	}
-	
-	public static void addUserName(String name){
-		final HashSet<String> allUserName = CollaborateList.getInstance().getAllUserName();
-		if(allUserName.contains(name)){
-			//System.out.println("cannot add this user");
-		}else{
+
+	public static void addUserName(String name) {
+		final Set<String> allUserName = CollaborateList.getInstance().getAllUserName();
+		if (!allUserName.contains(name))
 			allUserName.add(name);
-		}
 	}
-	
-	public static void delUserName(String name){
-		final HashSet<String> allUserName = CollaborateList.getInstance().getAllUserName();
+
+	public static void delUserName(String name) {
+		final Set<String> allUserName = CollaborateList.getInstance().getAllUserName();
 		allUserName.remove((String) name);
 	}
-	
-
 
 }