From 8cd208ebaa33627daf05d8ffff7b28e53a7067d0 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Thu, 7 Sep 2017 08:52:41 -0400 Subject: 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) --- .../core/service/UserProfileServiceImpl.java | 77 +++++++++++----------- 1 file changed, 40 insertions(+), 37 deletions(-) (limited to 'ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java') diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java index 5a123393..184ec85b 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.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 * @@ -38,9 +38,9 @@ package org.onap.portalsdk.core.service; import java.util.ArrayList; -import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Set; import java.util.SortedSet; import org.hibernate.criterion.Criterion; @@ -54,75 +54,78 @@ import org.springframework.transaction.annotation.Transactional; @Service("userProfile") @Transactional -public class UserProfileServiceImpl implements UserProfileService{ +public class UserProfileServiceImpl implements UserProfileService { - @Autowired - private DataAccessService dataAccessService; - + private DataAccessService dataAccessService; + + @Override @SuppressWarnings("unchecked") public List findAll() { return getDataAccessService().getList(User.class, null); } - + + @Override @SuppressWarnings("unchecked") - public User getUserByLoginId(String loginId){ - User user=null; + public User getUserByLoginId(String loginId) { + User user = null; List restrictionsList = new ArrayList(); - Criterion criterion1= Restrictions.eq("loginId",loginId); + Criterion criterion1 = Restrictions.eq("loginId", loginId); restrictionsList.add(criterion1); - List users = (List) getDataAccessService().getList(User.class,null, restrictionsList, null); - if(users!=null && users.size()==1) + List users = (List) getDataAccessService().getList(User.class, null, restrictionsList, null); + if (users != null && users.size() == 1) user = users.get(0); return user; } - - public void saveUser(User user){ - + + @Override + public void saveUser(User user) { getDataAccessService().saveDomainObject(user, null); } - + public DataAccessService getDataAccessService() { return dataAccessService; } - public void setDataAccessService(DataAccessService dataAccessService) { this.dataAccessService = dataAccessService; } - + + @Override @SuppressWarnings("unchecked") public List findAllUserWithOnOffline(String originOrgUserId) { - HashSet onlineUser = CollaborateList.getInstance().getAllUserName(); - List users = getDataAccessService().getList(User.class, null); - for(User u:users){ - if(onlineUser.contains(u.getOrgUserId())) + Set onlineUser = CollaborateList.getInstance().getAllUserName(); + List users = getDataAccessService().getList(User.class, null); + for (User u : users) { + if (onlineUser.contains(u.getOrgUserId())) u.setOnline(true); - if(u.getOrgUserId()!=null){ - if(originOrgUserId.compareTo(u.getOrgUserId()) > 0) { + if (u.getOrgUserId() != null) { + if (originOrgUserId.compareTo(u.getOrgUserId()) > 0) { u.setChatId(originOrgUserId + "-" + u.getOrgUserId()); - } else u.setChatId(u.getOrgUserId() + "-" + originOrgUserId ); + } else + u.setChatId(u.getOrgUserId() + "-" + originOrgUserId); } } return users; - + } - + + @Override public List findAllActive() { @SuppressWarnings("unchecked") - List users = getDataAccessService().getList(User.class, null); + List users = getDataAccessService().getList(User.class, null); Iterator itr = users.iterator(); - while(itr.hasNext()){ - User u = (User) itr.next(); - if(!u.getActive()) - itr.remove();//if not active remove user from list + while (itr.hasNext()) { + User u = itr.next(); + if (!u.getActive()) + itr.remove();// if not active remove user from list else { SortedSet roles = u.getRoles(); Iterator itrRoles = roles.iterator(); - while(itrRoles.hasNext()){ - Role role = (Role) itrRoles.next(); - if(!role.getActive()) - u.removeRole(role.getId());//if not active remove role from list + while (itrRoles.hasNext()) { + Role role = itrRoles.next(); + if (!role.getActive()) + u.removeRole(role.getId());// if not active remove role from list } } } -- cgit 1.2.3-korg