diff options
author | Christopher Lott (cl778h) <clott@research.att.com> | 2017-09-25 15:52:24 -0400 |
---|---|---|
committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-09-25 15:53:55 -0400 |
commit | 3a2b5c60384feb490e878020bdb9c01f514d7856 (patch) | |
tree | 840d02d1090640b08aa481f52d3385ad92552991 /ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java | |
parent | 65c475eb72271f674f5ec4502fa67fd972344543 (diff) |
Sonar Scans and Role Centralization; clean nl
PORTAL-21: centralized user role management
PORTAL-72: Address Sonar Scan code issues for ONAP - mostly on raptor
PORTAL-86: ONAP - Remove internal att.com usages from tests and otherfiles
PORTAL-90: Add debug statements to demo app's class; no functional change
Issue: PORTAL-21 PORTAL-72 PORTAL-86 PORTAL-90
Change-Id: I72a6c812009f51446330bf42bab6d3338d053805
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java')
-rw-r--r-- | ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java index 4bf78eed..1f2a3e8f 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/PostSearchServiceImpl.java @@ -55,7 +55,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service("postSearchService") -@Transactional public class PostSearchServiceImpl implements PostSearchService { private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PostSearchServiceImpl.class); @@ -65,7 +64,8 @@ public class PostSearchServiceImpl implements PostSearchService { @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public int process(HttpServletRequest request, PostSearchBean postSearch) { + @Transactional(rollbackFor = Exception.class) + public int process(HttpServletRequest request, PostSearchBean postSearch) throws Exception { HashMap additionalParams = new HashMap(); additionalParams.put(Parameters.PARAM_HTTP_REQUEST, request); int numUsersImported = 0; @@ -202,24 +202,26 @@ public class PostSearchServiceImpl implements PostSearchService { } user.setActive(true); - + Role role = null; try { dataAccessService.saveDomainObject(user, additionalParams); - Role role = (Role) dataAccessService.getDomainObject(Role.class, + role = (Role) dataAccessService.getDomainObject(Role.class, Long.valueOf(SystemProperties.getProperty(SystemProperties.POST_DEFAULT_ROLE_ID)), null); + if(role.getId() == null){ + logger.error(EELFLoggerDelegate.errorLogger, + "process failed: No Role Exsists in DB with requested RoleId :"+ Long.valueOf(SystemProperties.getProperty(SystemProperties.POST_DEFAULT_ROLE_ID))); + throw new Exception("user cannot be added"); + } user.addRole(role); numUsersImported++; - } catch (Exception e) { - logger.error(EELFLoggerDelegate.errorLogger, - "process: saveDomainObject failed on user " + user.getLoginId(), e); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "process: saveDomainObject failed on user " + user.getLoginId(), e); + throw e; } } } - } - return numUsersImported; } - } |