<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-project</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<!-- sdk-core -->
<dependency>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-core</artifactId>
<version>${project.version}</version>
</dependency>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-project</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<dependencies>
<!-- SDK components -->
<dependency>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-core</artifactId>
<version>${epsdk.version}</version>
</dependency>
<dependency>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-analytics</artifactId>
<version>${epsdk.version}</version>
</dependency>
<dependency>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-workflow</artifactId>
<version>${epsdk.version}</version>
</dependency>
import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.openecomp.portalsdk.core.service.RoleService;
import org.openecomp.portalsdk.core.service.UserProfileService;
+import org.openecomp.portalsdk.core.service.UserService;
import org.openecomp.portalsdk.core.web.support.AppUtils;
import org.openecomp.portalsdk.core.web.support.JsonMessage;
import org.openecomp.portalsdk.core.web.support.UserUtils;
@Autowired
UserProfileService service;
+ @Autowired
+ UserService userService;
+
@Autowired
RoleService roleService;
private String viewName;
@RequestMapping(value = { "/profile" }, method = RequestMethod.GET)
- public ModelAndView profile(HttpServletRequest request, HttpServletResponse response) {
+ public ModelAndView profile(HttpServletRequest request, HttpServletResponse response) throws Exception{
Map<String, Object> model = new HashMap<String, Object>();
ObjectMapper mapper = new ObjectMapper();
User user = UserUtils.getUserSession(request);
profileId = profile.getId();
} else {
profileId = Long.parseLong(request.getParameter("profile_id"));
- profile = (User) service.getUser(request.getParameter("profile_id"));
+ profile = (User) userService.getUser(String.valueOf(profileId));
}
try {
}
@RequestMapping(value = { "/self_profile" }, method = RequestMethod.GET)
- public ModelAndView self_profile(HttpServletRequest request) {
+ public ModelAndView self_profile(HttpServletRequest request) throws Exception{
Map<String, Object> model = new HashMap<String, Object>();
ObjectMapper mapper = new ObjectMapper();
User user = UserUtils.getUserSession(request);
profile = UserUtils.getUserSession(request);
- profileId = profile.getId();
- profile = (User) service.getUser(profileId.toString());
-
try {
model.put("stateList", mapper.writeValueAsString(getStates()));
model.put("countries", mapper.writeValueAsString(getCountries()));
}
@RequestMapping(value = { "/get_self_profile" }, method = RequestMethod.GET)
- public void getSelfProfile(HttpServletRequest request, HttpServletResponse response) {
+ public void getSelfProfile(HttpServletRequest request, HttpServletResponse response) throws Exception{
Map<String, Object> model = new HashMap<String, Object>();
ObjectMapper mapper = new ObjectMapper();
User user = UserUtils.getUserSession(request);
User profile = null;
Long profileId = null;
- profile = UserUtils.getUserSession(request);
- profileId = profile.getId();
- profile = (User) service.getUser(profileId.toString());
-
+ profile = (User) UserUtils.getUserSession(request);
try {
model.put("stateList", mapper.writeValueAsString(getStates()));
model.put("countries", mapper.writeValueAsString(getCountries()));
profileId = profile.getId();
} else {
profileId = Long.parseLong(request.getParameter("profile_id"));
- profile = (User) service.getUser(request.getParameter("profile_id"));
+ profile = (User) userService.getUser(String.valueOf(profileId));
+
}
model.put("stateList", mapper.writeValueAsString(getStates()));
model.put("countries", mapper.writeValueAsString(getCountries()));
Long profileId = Long.parseLong(request.getParameter("profile_id"));
- User domainUser = (User) service.getUser(request.getParameter("profile_id"));
+ User domainUser = (User) userService.getUser(String.valueOf(profileId));
// user.setRoles(domainUser.getRoles());
user.setPseudoRoles(domainUser.getPseudoRoles());
user.setUserApps(domainUser.getUserApps());
JsonNode root = mapper.readTree(request.getReader());
Role role = mapper.readValue(root.get("role").toString(), Role.class);
- // Long profileId = Long.parseLong(request.getParameter("profile_id"));
+ String profileId = request.getParameter("profile_id");
- User domainUser = (User) service.getUser(request.getParameter("profile_id"));
+ User domainUser = (User) userService.getUser(profileId);
domainUser.removeRole(role.getId());
service.saveUser(domainUser);
- logger.info(EELFLoggerDelegate.auditLogger, "Remove role " + role.getId() + " from user " + request.getParameter("profile_id"));
+ logger.info(EELFLoggerDelegate.auditLogger, "Remove role " + role.getId() + " from user " + profileId);
response.setCharacterEncoding("UTF-8");
response.setContentType("application / json");
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
JsonNode root = mapper.readTree(request.getReader());
Role role = mapper.readValue(root.get("role").toString(), Role.class);
-
- // Long profileId = Long.parseLong(request.getParameter("profile_id"));
-
- User domainUser = (User) service.getUser(request.getParameter("profile_id"));
-
+ String profileId = request.getParameter("profile_id");
+ User domainUser = (User) userService.getUser(profileId);
domainUser.addRole(role);
-
service.saveUser(domainUser);
- logger.info(EELFLoggerDelegate.auditLogger, "Add new role " + role.getName() + " to user " + request.getParameter("profile_id"));
+ logger.info(EELFLoggerDelegate.auditLogger, "Add new role " + role.getName() + " to user " + profileId);
response.setCharacterEncoding("UTF-8");
response.setContentType("application / json");
request.setCharacterEncoding("UTF-8");
PrintWriter out = response.getWriter();
-
Map<String, Object> model = new HashMap<String, Object>();
model.put("profile", mapper.writeValueAsString(domainUser));
JSONObject j = new JSONObject(mapper.writeValueAsString(domainUser));
import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.openecomp.portalsdk.core.service.FnMenuService;
import org.openecomp.portalsdk.core.service.UserProfileService;
+import org.openecomp.portalsdk.core.service.UserService;
import org.openecomp.portalsdk.core.util.SystemProperties;
import org.openecomp.portalsdk.core.web.support.JsonMessage;
import org.springframework.beans.factory.annotation.Autowired;
@Autowired
private UserProfileService service;
+ @Autowired
+ UserService userService;
+
@Autowired
private FnMenuService fnMenuService;
logger.info(EELFLoggerDelegate.applicationLogger,
"Initiating toggleProfileActive in ProfileSearchController");
String userId = request.getParameter("profile_id");
- User user = (User) service.getUser(userId);
+ User user = (User) userService.getUser(userId);
user.setActive(!user.getActive());
service.saveUser(user);
logger.info(EELFLoggerDelegate.auditLogger,
domainRole = new Role();
domainRole.setName(role.getName());
domainRole.setPriority(role.getPriority());
- if (role.getChildRoles().size() > 0) {
+ if(role.getChildRoles() != null && role.getChildRoles().size() > 0 ){
+// if (role.getChildRoles().size() > 0 ) {
for (Object childRole : childRoles) {
domainRole.addChildRole((Role) childRole);
}
+// }
}
- if (role.getRoleFunctions().size() > 0) {
+ if(role.getRoleFunctions() != null && role.getRoleFunctions().size() > 0){
+// if (role.getRoleFunctions().size() > 0) {
for (Object roleFunction : roleFunctions) {
domainRole.addRoleFunction((RoleFunction) roleFunction);
}
+// }
}
}
Map<String, Object> model = new HashMap<String, Object>();
ObjectMapper mapper = new ObjectMapper();
User user = UserUtils.getUserSession(request);
-
-
try {
model.put("availableRoleFunctions", mapper.writeValueAsString(service.getRoleFunctions(user.getOrgUserId())));
JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
} catch (Exception e) {
restCallStatus="fail";
logger.error(EELFLoggerDelegate.errorLogger, "saveRoleFunction failed", e);
+ throw new Exception("failed while Saving RoleFunction");
}
JsonMessage msg = new JsonMessage(mapper.writeValueAsString(restCallStatus));
JSONObject j = new JSONObject(msg);
try {
String data = roleFunc;
RoleFunction availableRoleFunction = mapper.readValue(data, RoleFunction.class);
- String code = availableRoleFunction.getCode();
- RoleFunction domainRoleFunction = service.getRoleFunction(user.getOrgUserId(),code);
- domainRoleFunction.setName(availableRoleFunction.getName());
- domainRoleFunction.setCode(code);
+ String code = availableRoleFunction.getCode();
List<RoleFunction> currentRoleFunction = service.getRoleFunctions(user.getOrgUserId());
restCallStatus="success";
for(RoleFunction roleF:currentRoleFunction){
}
}
if(canSave)
- service.saveRoleFunction(user.getOrgUserId(),domainRoleFunction);
+ service.saveRoleFunction(user.getOrgUserId(),availableRoleFunction);
} catch (Exception e) {
restCallStatus="fail";
logger.error(EELFLoggerDelegate.errorLogger, "addRoleFunction failed", e);
+ throw new Exception(e.getMessage());
}
JsonMessage msg = new JsonMessage(mapper.writeValueAsString(restCallStatus));
JSONObject j = new JSONObject(msg);
} catch (Exception e) {
restCallStatus="fail";
logger.error(EELFLoggerDelegate.errorLogger, "removeRoleFunction failed", e);
+ throw new Exception(e.getMessage());
}
JsonMessage msg = new JsonMessage(mapper.writeValueAsString(restCallStatus));
JSONObject j = new JSONObject(msg);
commandBean = getLoginService().findUser(commandBean,
(String) request.getAttribute(MenuProperties.MENU_PROPERTIES_FILENAME_KEY),
additionalParamsMap);
- List<RoleFunction> roleFunctionList= roleService.getRoleFunctions(user.getLoginId());
+ List<RoleFunction> roleFunctionList= roleService.getRoleFunctions(userId);
if (commandBean.getUser() == null) {
String loginErrorMessage = (commandBean.getLoginErrorMessage() != null)
? commandBean.getLoginErrorMessage()
<!-- This is the Maven project object model (POM) file for the open-source SDK web app.
This is NOT the Portal - but it is developed and supported by the Portal team. -->
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-app-os</artifactId>
<version>1.3.0-SNAPSHOT</version>
<packaging>war</packaging>
</archive>
<overlays>
<overlay>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-app-overlay</artifactId>
</overlay>
</overlays>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-project</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<query name="deleteReportSecurityRoles">
delete from ReportUserRole where repId = :report_id and roleId =:role_id
</query>
+
+ <query name="getUserByProfileId">
+ select orgUserId from User where id = :user_id
+ </query>
</hibernate-mapping>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-project</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<!-- internal -->
<dependency>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-fw</artifactId>
<version>${project.version}</version>
<exclusions>
*/
@Bean
@Conditional(LocalAccessCondition.class)
- public UserProfileService userProfileServiceImpl() {
- return new UserProfileServiceImpl();
+ public UserService userServiceImpl() {
+ return new UserServiceImpl();
}
*/
@Bean
@Conditional(CentralAccessCondition.class)
- public UserProfileService userProfileServiceCentalizedImpl() {
- return new UserProfileServiceCentalizedImpl();
+ public UserService userServiceCentalizedImpl() {
+ return new UserServiceCentalizedImpl();
}
import org.openecomp.portalsdk.core.web.support.AppUtils;
import org.openecomp.portalsdk.core.web.support.UserUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Transactional
public class LoginServiceCentralizedImpl extends FusionService implements LoginService {
private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(LoginServiceCentralizedImpl.class);
Set appMenu = getMenuBuilder().getMenu(
SystemProperties.getProperty(SystemProperties.APPLICATION_MENU_SET_NAME), dataAccessService);
bean.setMenu(appMenu != null ? appMenu : new HashSet());
- System.out.println(appMenu);
Set businessDirectMenu = getMenuBuilder().getMenu(
SystemProperties.getProperty(SystemProperties.BUSINESS_DIRECT_MENU_SET_NAME),
dataAccessService);
import org.openecomp.portalsdk.core.domain.User;
import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
+@Transactional
public class ProfileServiceCentralizedImpl implements ProfileService{
private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ProfileServiceCentralizedImpl.class);
@Autowired
RestApiRequestBuilder restApiRequestBuilder ;
+ @SuppressWarnings("unchecked")
@Override
public List<Profile> findAll() throws Exception{
-
- List<Profile> profileList =null;
- ObjectMapper mapper = new ObjectMapper();
-
- String user = restApiRequestBuilder.getViaREST("/findAllProfiles", true,null);
- profileList = mapper.readValue(user,
- TypeFactory.defaultInstance().constructCollectionType(List.class, Profile.class));
- return profileList;
+ return getDataAccessService().getList(Profile.class, null);
}
@Override
public static String content_type = "application/json";
- public String getViaREST(String restEndPoint, boolean isBasicAuth,String userId) {
+ public String getViaREST(String restEndPoint, boolean isBasicAuth,String userId) throws Exception {
String appName = "";
String requestId = "";
String appUserName = "";
response = RestWebServiceClient.getInstance().getPortalContent(restEndPoint, userId,appName, requestId, appUserName,
decryptedPwd, isBasicAuth);
} catch (Exception ex) {
- response = "Failed to get roles " + ex.toString();
+ response = "Failed to perform GET " + ex.toString();
+ throw new Exception(ex.getMessage());
}
logger.debug(EELFLoggerDelegate.debugLogger, "getRoles response: {}", response);
return response;
}
- public void postViaREST(String restEndPoint, boolean isBasicAuth, String content,String userId) {
+ public void postViaREST(String restEndPoint, boolean isBasicAuth, String content,String userId) throws Exception {
String appName = "";
String requestId = "";
String appUserName = "";
decryptedPwd, content_type, content, isBasicAuth);
} catch (Exception ex) {
logger.error(EELFLoggerDelegate.debugLogger, "POST response: {}", ex);
+ throw new Exception("Save Failed");
}
logger.debug(EELFLoggerDelegate.debugLogger, "POST response: {}");
}
- public void deleteViaRest(String restEndPoint, boolean isBasicAuth, String content, String filter , String userId) {
+ public void deleteViaRest(String restEndPoint, boolean isBasicAuth, String content, String filter , String userId) throws Exception {
String appName = "";
String requestId = "";
String appUserName = "";
decryptedPwd, content_type, content, isBasicAuth, filter);
} catch (Exception ex) {
logger.error(EELFLoggerDelegate.debugLogger, "DELETE response: {}", ex);
+ throw new Exception("Delete Failed");
}
logger.debug(EELFLoggerDelegate.debugLogger, "DELETE response: {}");
* @param domainRole Object to be saved
* Method saveRole saves the Role Object
*/
- void saveRole(String requestedLoginId,Role domainRole);
+ void saveRole(String requestedLoginId,Role domainRole) throws Exception;
/**
*
* @param domainRole Object to be removed
* Method deleteRole deletes the requested Role Object
*/
- void deleteRole(String requestedLoginId,Role domainRole);
+ void deleteRole(String requestedLoginId,Role domainRole) throws Exception;
/**
*
* @param domainRoleFunction
* Method saveRoleFunction saves the requested RoleFunction object
*/
- void saveRoleFunction(String requestedLoginId,RoleFunction domainRoleFunction);
+ void saveRoleFunction(String requestedLoginId,RoleFunction domainRoleFunction) throws Exception;
/**
*
* @param domainRoleFunction
* Method deleteRoleFunction deletes the requested RoleFunction object
*/
- void deleteRoleFunction(String requestedLoginId,RoleFunction domainRoleFunction);
+ void deleteRoleFunction(String requestedLoginId,RoleFunction domainRoleFunction) throws Exception;
/**
*
package org.openecomp.portalsdk.core.service;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@Override
public Role getRole(String loginId, Long id) throws Exception {
ObjectMapper mapper = new ObjectMapper();
-
String roleString = restApiRequestBuilder.getViaREST("/role/" + id, true, loginId);
Role role = null;
-
role = mapper.readValue(roleString, Role.class);
+ if (role.getRoleFunctions() != null) {
+ @SuppressWarnings("unchecked")
+ Set<RoleFunction> roleFunctionList = role.getRoleFunctions();
+ Set<RoleFunction> roleFunctionListNew = new HashSet<>();
+ Iterator<RoleFunction> itetaror = roleFunctionList.iterator();
+ while (itetaror.hasNext()) {
+ Object nextValue = itetaror.next();
+ RoleFunction roleFun = mapper.convertValue(nextValue, RoleFunction.class);
+ roleFunctionListNew.add(roleFun);
+ }
+ role.setRoleFunctions(roleFunctionListNew);
+ }
logger.info(EELFLoggerDelegate.applicationLogger, "role_id" + role.getId());
return role;
}
@Override
- public void saveRole(String loginId, Role domainRole) {
+ public void saveRole(String loginId, Role domainRole) throws Exception {
+ ObjectMapper mapper = new ObjectMapper();
+ String role = mapper.writeValueAsString(domainRole);
try {
- restApiRequestBuilder.postViaREST("/saveRole", true, domainRole.toString(), loginId);
+ restApiRequestBuilder.postViaREST("/saveRole", true, role, loginId);
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "saveRole Failed", e);
+ throw new Exception(e.getMessage());
}
}
@Override
- public void deleteRole(String loginId, Role domainRole) {
-
+ public void deleteRole(String loginId, Role domainRole) throws Exception {
+ ObjectMapper mapper = new ObjectMapper();
+ String role = mapper.writeValueAsString(domainRole);
String filter = " where active_yn = 'Y' ";
try {
- restApiRequestBuilder.deleteViaRest("/deleteRole", true, domainRole.toString(), filter, loginId);
+ restApiRequestBuilder.deleteViaRest("/deleteRole", true, role, filter, loginId);
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "deleteRole Failed", e);
+ throw new Exception(e.getMessage());
}
}
@Override
public List<Role> getAvailableRoles(String requestedLoginId) throws Exception {
ObjectMapper mapper = new ObjectMapper();
-
String roleList = restApiRequestBuilder.getViaREST("/getRoles", true, requestedLoginId);
List<Role> roles = null;
roles = mapper.readValue(roleList,
@Override
public List<Role> getActiveRoles(String requestedLoginId) throws Exception {
ObjectMapper mapper = new ObjectMapper();
- String roleString = restApiRequestBuilder.getViaREST("/activeRoles?active_yn = 'Y'", true, requestedLoginId);
+ String roleString = restApiRequestBuilder.getViaREST("/activeRoles", true, requestedLoginId);
List<Role> roles = null;
roles = mapper.readValue(roleString,
TypeFactory.defaultInstance().constructCollectionType(List.class, Role.class));
@Override
public RoleFunction getRoleFunction(String requestedLoginId, String code) throws Exception {
-
ObjectMapper mapper = new ObjectMapper();
String responseString = restApiRequestBuilder.getViaREST("/getRoleFunction/" + code, true, requestedLoginId);
- RoleFunction roleFunction = null;
- roleFunction = mapper.readValue(responseString, RoleFunction.class);
+ RoleFunction roleFunction = new RoleFunction();
+ if (!responseString.isEmpty()) {
+ roleFunction = mapper.readValue(responseString, RoleFunction.class);
+ }
return roleFunction;
}
@Override
- public void saveRoleFunction(String requestedLoginId, RoleFunction domainRoleFunction) {
- try {
- restApiRequestBuilder.postViaREST("/saveRoleFunction", true, domainRoleFunction.toString(),
- requestedLoginId);
- } catch (Exception e) {
- logger.error(EELFLoggerDelegate.errorLogger, "saveRoleFunction Failed", e);
+ public void saveRoleFunction(String requestedLoginId, RoleFunction domainRoleFunction) throws Exception {
+ ObjectMapper mapper = new ObjectMapper();
+ String roleFunction = mapper.writeValueAsString(domainRoleFunction);
+ try{
+ restApiRequestBuilder.postViaREST("/saveRoleFunction", true, roleFunction, requestedLoginId);
+ }catch(Exception e){
+ logger.error(EELFLoggerDelegate.errorLogger, "deleteDependcyRoleRecord Failed", e);
+ throw new Exception(e.getMessage());
}
}
@Override
- public void deleteRoleFunction(String requestedLoginId, RoleFunction domainRoleFunction) {
-
+ public void deleteRoleFunction(String requestedLoginId, RoleFunction domainRoleFunction) throws Exception {
+ ObjectMapper mapper = new ObjectMapper();
+ String roleFunction = mapper.writeValueAsString(domainRoleFunction);
try {
- restApiRequestBuilder.deleteViaRest("/deleteRoleFucntion", true, domainRoleFunction.toString(), null,
- requestedLoginId);
+ restApiRequestBuilder.deleteViaRest("/deleteRoleFunction", true, roleFunction, null, requestedLoginId);
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "deleteRoleFunction Failed", e);
+ throw new Exception(e.getMessage());
}
}
@Override
public void deleteDependcyRoleRecord(String requestedLoginId, Long id) {
-
try {
restApiRequestBuilder.deleteViaRest("/deleteDependcyRoleRecord/" + id, true, null, null, requestedLoginId);
} catch (Exception e) {
import org.openecomp.portalsdk.core.web.support.AppUtils;
import org.openecomp.portalsdk.core.web.support.UserUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+@Transactional
public class UrlAccessCentalizedImpl implements UrlAccessService {
@Autowired
import org.openecomp.portalsdk.core.domain.UrlsAccessible;
import org.openecomp.portalsdk.core.web.support.UserUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+@Transactional
public class UrlAccessImpl implements UrlAccessService{
@Autowired
DataAccessService dataAccessService;
-
-
@Override
public boolean isUrlAccessible(HttpServletRequest request, String currentUrl) {
boolean isAccessible = false;
// loop through the list of restricted URL's
if (list != null && list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
- /*
- * Object[] restrictedUrl = (Object[])list.get(i);
- *
- * String url = (String)restrictedUrl[0]; String functionCd =
- * (String)restrictedUrl[1];
- */
UrlsAccessible urlFunctions = (UrlsAccessible) list.get(i);
// String url = (String) urlFunctions.getUrl();
String functionCd = (String) urlFunctions.getFunctionCd();
public interface UserProfileService {
List<User> findAll();
- User getUser(String id);
User getUserByLoginId(String loginId);
void saveUser(User user);
public List<User> findAllUserWithOnOffline(String originOrgUserId);
+++ /dev/null
-package org.openecomp.portalsdk.core.service;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedSet;
-
-import org.openecomp.portalsdk.core.domain.Role;
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.domain.support.CollaborateList;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-
-@Transactional
-public class UserProfileServiceCentalizedImpl implements UserProfileService {
-
- private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UserProfileServiceCentalizedImpl.class);
-
- @Autowired
- AppService appService;
-
- @Autowired
- RestApiRequestBuilder restApiRequestBuilder;
-
- @Autowired
- private DataAccessService dataAccessService;
-
- public DataAccessService getDataAccessService() {
- return dataAccessService;
- }
-
- public void setDataAccessService(DataAccessService dataAccessService) {
- this.dataAccessService = dataAccessService;
- }
-
- @Override
- public List<User> findAll() {
- List<User> roles = new ArrayList<>();
- ObjectMapper mapper = new ObjectMapper();
-
- String user = restApiRequestBuilder.getViaREST("/findAll", true,null);
- try {
- roles = mapper.readValue(user,
- TypeFactory.defaultInstance().constructCollectionType(List.class, User.class));
- } catch (JsonParseException e) {
- logger.error(EELFLoggerDelegate.errorLogger, "Json parsing failed", e);
- } catch (JsonMappingException e) {
- logger.error(EELFLoggerDelegate.errorLogger, "Json mapping failed", e);
- } catch (IOException e) {
- logger.error(EELFLoggerDelegate.errorLogger, "IO exception", e);
- }
-
- return roles;
- }
-
- @Override
- public User getUser(String id) {
- ObjectMapper mapper = new ObjectMapper();
- User user = new User();
- String responseString = restApiRequestBuilder.getViaREST("/getUser/" + id, true,id);
- try {
-
- user = mapper.readValue(responseString, User.class);
- } catch (JsonParseException e) {
- logger.error(EELFLoggerDelegate.errorLogger, "Json parsing failed", e);
- } catch (JsonMappingException e) {
- logger.error(EELFLoggerDelegate.errorLogger, "Json mapping failed", e);
- } catch (IOException e) {
- logger.error(EELFLoggerDelegate.errorLogger, "IO exception", e);
- }
-
- return user;
- }
-
- @Override
- public User getUserByLoginId(String loginId) {
- return getUser(loginId);
- }
-
- @Override
- public void saveUser(User user) {
- try {
- getDataAccessService().saveDomainObject(user, null);
- } catch (Exception e) {
- logger.error(EELFLoggerDelegate.errorLogger, "saveUser Failed", e);
- }
- }
-
- @Override
- public List<User> findAllUserWithOnOffline(String originOrgUserId) {
- HashSet<String> onlineUser = CollaborateList.getInstance().getAllUserName();
- List<User> users = findAll();
- for (User u : users) {
- if (onlineUser.contains(u.getOrgUserId()))
- u.setOnline(true);
- if (u.getOrgUserId() != null) {
- if (originOrgUserId.compareTo(u.getOrgUserId()) > 0) {
- u.setChatId(originOrgUserId + "-" + u.getOrgUserId());
- } else
- u.setChatId(u.getOrgUserId() + "-" + originOrgUserId);
- }
- }
- return users;
- }
-
- @Override
- public List<User> findAllActive() {
- List<User> users = findAll();
- Iterator<User> itr = users.iterator();
- while (itr.hasNext()) {
- User u = (User) itr.next();
- if (!u.getActive())
- itr.remove();// if not active remove user from list
- else {
- SortedSet<Role> roles = u.getRoles();
- Iterator<Role> 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
- }
- }
- }
- return users;
- }
-
-}
import org.openecomp.portalsdk.core.domain.User;
import org.openecomp.portalsdk.core.domain.support.CollaborateList;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+@Service("userProfile")
@Transactional
public class UserProfileServiceImpl implements UserProfileService{
return getDataAccessService().getList(User.class, null);
}
- public User getUser(String userId){
- return (User) getDataAccessService().getDomainObject(User.class, Long.parseLong(userId), null);
- }
-
@SuppressWarnings("unchecked")
public User getUserByLoginId(String loginId){
User user=null;
--- /dev/null
+package org.openecomp.portalsdk.core.service;
+
+import org.openecomp.portalsdk.core.domain.User;
+
+public interface UserService {
+
+
+ /**
+ *
+ * @param id orgUserID
+ * @return
+ * @throws Exception
+ * Method getUser returns the User Object
+ */
+ User getUser(String id) throws Exception;
+}
--- /dev/null
+package org.openecomp.portalsdk.core.service;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.openecomp.portalsdk.core.domain.Role;
+import org.openecomp.portalsdk.core.domain.RoleFunction;
+import org.openecomp.portalsdk.core.domain.User;
+import org.openecomp.portalsdk.core.domain.UserApp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Transactional
+public class UserServiceCentalizedImpl implements UserService {
+
+ @Autowired
+ AppService appService;
+
+ @Autowired
+ RestApiRequestBuilder restApiRequestBuilder;
+
+ @Autowired
+ LoginService loginService;
+
+ @Autowired
+ private DataAccessService dataAccessService;
+
+ public DataAccessService getDataAccessService() {
+ return dataAccessService;
+ }
+
+ public void setDataAccessService(DataAccessService dataAccessService) {
+ this.dataAccessService = dataAccessService;
+ }
+
+
+ @Override
+ public User getUser(String id) throws Exception {
+ ObjectMapper mapper = new ObjectMapper();
+ User user = new User();
+ HashSet<RoleFunction> rolefun = null;
+ String orgUserId = getUserByProfileId(id);
+ String responseString = restApiRequestBuilder.getViaREST("/getUser/" + orgUserId, true, id);
+ user = mapper.readValue(responseString, User.class);
+
+ @SuppressWarnings("unchecked")
+ Set<UserApp> setAppsObj = user.getUserApps();
+
+ Iterator<UserApp> it = setAppsObj.iterator();
+ while (it.hasNext()) {
+ Object next = it.next();
+
+ UserApp nextApp = mapper.convertValue(next, UserApp.class);
+ rolefun = new HashSet<>();
+ Role role = nextApp.getRole();
+
+ Set<RoleFunction> roleFunctionList = role.getRoleFunctions();
+ Set<RoleFunction> roleFunctionListNew = new HashSet<>();
+ Iterator<RoleFunction> itetaror = roleFunctionList.iterator();
+ while (itetaror.hasNext()) {
+ Object nextValue = itetaror.next();
+ RoleFunction roleFunction = mapper.convertValue(nextValue, RoleFunction.class);
+ roleFunctionListNew.add(roleFunction);
+ }
+
+ role.setRoleFunctions(roleFunctionListNew);
+ nextApp.setRole(role);
+ nextApp.getRole().getRoleFunctions();
+ SortedSet<UserApp> UserAppSet = new TreeSet<>();
+ UserAppSet.add(nextApp);
+ user.setUserApps(UserAppSet);
+ }
+
+ return user;
+ }
+
+ public String getUserByProfileId(String id) {
+ Map<String, Long> params = new HashMap<String, Long>();
+ params.put("user_id", new Long(id));
+ @SuppressWarnings("rawtypes")
+ List list = getDataAccessService().executeNamedQuery("getUserByProfileId", params, null);
+ String orgUserId = "";
+ if (list != null && !list.isEmpty())
+ orgUserId = (String) list.get(0);
+ return orgUserId;
+ }
+
+}
--- /dev/null
+package org.openecomp.portalsdk.core.service;
+
+import org.openecomp.portalsdk.core.domain.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class UserServiceImpl implements UserService {
+
+ @Autowired
+ private DataAccessService dataAccessService;
+
+ public DataAccessService getDataAccessService() {
+ return dataAccessService;
+ }
+
+ public void setDataAccessService(DataAccessService dataAccessService) {
+ this.dataAccessService = dataAccessService;
+ }
+
+ @Override
+ public User getUser(String id) {
+ return (User) getDataAccessService().getDomainObject(User.class, Long.parseLong(id), null);
+
+ }
+
+}
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
import org.openecomp.portalsdk.core.domain.Role;
import org.openecomp.portalsdk.core.domain.RoleFunction;
-import org.openecomp.portalsdk.core.domain.UrlsAccessible;
import org.openecomp.portalsdk.core.domain.User;
import org.openecomp.portalsdk.core.exception.SessionExpiredException;
import org.openecomp.portalsdk.core.lm.FusionLicenseManager;
import org.openecomp.portalsdk.core.restful.domain.EcompRole;
import org.openecomp.portalsdk.core.restful.domain.EcompUser;
import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.service.UrlAccessService;
import org.openecomp.portalsdk.core.util.SystemProperties;
import org.springframework.beans.factory.annotation.Autowired;
getRoleFunctions(request);
- // truncate the role (and therefore the role function) data to save
- // memory in the session
- user.setRoles(null);
session.setAttribute(SystemProperties.getProperty(SystemProperties.USER_NAME), user.getFullName());
session.setAttribute(SystemProperties.FIRST_NAME, user.getFirstName());
session.setAttribute(SystemProperties.LAST_NAME, user.getLastName());
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-project</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-project</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<dependencies>
<!-- sdk-core -->
<dependency>
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-core</artifactId>
<version>${project.version}</version>
</dependency>
<modelVersion>4.0.0</modelVersion>
<!-- ECOMP Portal SDK Maven parent project -->
- <groupId> org.openecomp.ecompsdkos</groupId>
+ <groupId>org.openecomp.ecompsdkos</groupId>
<artifactId>epsdk-project</artifactId>
<version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
Code Review / ecompsdkos.git / commitdiff