X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fportal%2Fdomain%2FUserRoles.java;h=83cce3e3df5e488cc701a9ad373405fcd10966f8;hb=627badaf69987c01811c477219fd943757a635f5;hp=1483f34a3d27416dbe8d9574df79216c8d26da2e;hpb=ba838f2e13f1e8050c75e68bd3733d56d8f416d5;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRoles.java
index 1483f34a..83cce3e3 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRoles.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRoles.java
@@ -1,113 +1,113 @@
-/*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-package org.openecomp.portalapp.portal.domain;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
-
-public class UserRoles implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	/* 
-	private static final HashMap<Long, String> rolesDictionary;
-	// remove hard coded roles
-	static {
-		rolesDictionary = new HashMap<Long, String>();
-		rolesDictionary.put(Long.valueOf(SystemProperties.getProperty(SystemProperties.SYS_ADMIN_ROLE_ID)).longValue(), "superAdmin");
-		rolesDictionary.put(Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.ACCOUNT_ADMIN_ROLE_ID)).longValue(), "admin");
-	}
-	*/
-
-	public UserRoles(UserRole user) {
-		setOrgUserId(user.getOrgUserId());
-		setFirstName(user.getFirstName());
-		setLastName(user.getLastName());
-		setGuestSession(user.getUser_Id()==-1 ? true : false);
-
-		addRole(user.getRoleName());
-	}
-
-	public void addRole(String roleName) {
-		//String normalizedRole = normalizeRole(roleId);
-		if (!getRoles().contains(roleName)) {
-			this.roles.add(roleName);
-		}
-	}
-
-	/*
-	public static String normalizeRole(Long role) {
-		String roleTranslated = rolesDictionary.get(role);
-		return roleTranslated == null ? "user" : roleTranslated;
-	}
-	*/
-
-	private String orgUserId;
-	private String firstName;
-	private String lastName;
-	private boolean guestSession;
-
-	// TODO: Make into set
-	private List<String> roles = new ArrayList<String>();
-
-	public String getFirstName() {
-		return firstName;
-	}
-
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-
-	public String getLastName() {
-		return lastName;
-	}
-
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	public String getOrgUserId() {
-		return orgUserId;
-	}
-
-	public void setOrgUserId(String orgUserId) {
-		this.orgUserId = orgUserId;
-	}
-
-	public List<String> getRoles() {
-		return roles;
-	}
-
-	public void setRoles(List<String> roles) {
-		this.roles = roles;
-	}
-
-	public void setGuestSession(boolean guestSession) {
-		this.guestSession = guestSession;
-	}
-
-	public boolean getGuestSession() {
-		return this.guestSession;
-	}
-}
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+
+public class UserRoles implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/* 
+	private static final HashMap<Long, String> rolesDictionary;
+	// remove hard coded roles
+	static {
+		rolesDictionary = new HashMap<Long, String>();
+		rolesDictionary.put(Long.valueOf(SystemProperties.getProperty(SystemProperties.SYS_ADMIN_ROLE_ID)).longValue(), "superAdmin");
+		rolesDictionary.put(Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.ACCOUNT_ADMIN_ROLE_ID)).longValue(), "admin");
+	}
+	*/
+
+	public UserRoles(UserRole user) {
+		setOrgUserId(user.getOrgUserId());
+		setFirstName(user.getFirstName());
+		setLastName(user.getLastName());
+		setGuestSession(user.getUser_Id()==-1 ? true : false);
+
+		addRole(user.getRoleName());
+	}
+
+	public void addRole(String roleName) {
+		//String normalizedRole = normalizeRole(roleId);
+		if (!getRoles().contains(roleName)) {
+			this.roles.add(roleName);
+		}
+	}
+
+	/*
+	public static String normalizeRole(Long role) {
+		String roleTranslated = rolesDictionary.get(role);
+		return roleTranslated == null ? "user" : roleTranslated;
+	}
+	*/
+
+	private String orgUserId;
+	private String firstName;
+	private String lastName;
+	private boolean guestSession;
+
+	// TODO: Make into set
+	private List<String> roles = new ArrayList<String>();
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+
+	public List<String> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<String> roles) {
+		this.roles = roles;
+	}
+
+	public void setGuestSession(boolean guestSession) {
+		this.guestSession = guestSession;
+	}
+
+	public boolean getGuestSession() {
+		return this.guestSession;
+	}
+}