diff options
Diffstat (limited to 'ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service')
3 files changed, 16 insertions, 9 deletions
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java index 6acd433c..4b31596d 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java @@ -71,6 +71,8 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS @Autowired private UserService userService; + + private static String portalApiVersion = "/v1"; @Override public LoginBean findUser(LoginBean bean, String menuPropertiesFilename, @@ -210,7 +212,7 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS } private User findUser(LoginBean bean) throws IOException { - String repsonse = restApiRequestBuilder.getViaREST("/user/" + bean.getUserid(), true, bean.getUserid()); + String repsonse = restApiRequestBuilder.getViaREST(portalApiVersion+"/user/" + bean.getUserid(), true, bean.getUserid()); User user = userService.userMapper(repsonse); user.setId(getUserIdByOrgUserId(user.getOrgUserId())); return user; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java index 777968e5..9f2a48c5 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java @@ -60,10 +60,12 @@ public class RoleServiceCentralizedAccess implements RoleService { @Autowired private RestApiRequestBuilder restApiRequestBuilder; + + private static String portalApiVersion = "/v1"; @Override public List<RoleFunction> getRoleFunctions(String loginId) throws IOException { - String roleFunctionString = restApiRequestBuilder.getViaREST("/functions", true, loginId); + String roleFunctionString = restApiRequestBuilder.getViaREST(portalApiVersion+"/functions", true, loginId); ObjectMapper mapper = new ObjectMapper(); List<RoleFunction> roleFunctionList = mapper.readValue(roleFunctionString, TypeFactory.defaultInstance().constructCollectionType(List.class, RoleFunction.class)); @@ -105,7 +107,7 @@ public class RoleServiceCentralizedAccess implements RoleService { @Override public Role getRole(String loginId, Long id) throws IOException { ObjectMapper mapper = new ObjectMapper(); - String roleString = restApiRequestBuilder.getViaREST("/role/" + id, true, loginId); + String roleString = restApiRequestBuilder.getViaREST(portalApiVersion+"/role/" + id, true, loginId); Role role = mapper.readValue(roleString, Role.class); if (role.getRoleFunctions() != null) { @SuppressWarnings("unchecked") @@ -141,7 +143,7 @@ public class RoleServiceCentralizedAccess implements RoleService { @Override public List<Role> getAvailableRoles(String requestedLoginId) throws IOException { ObjectMapper mapper = new ObjectMapper(); - String roleList = restApiRequestBuilder.getViaREST("/roles", true, requestedLoginId); + String roleList = restApiRequestBuilder.getViaREST(portalApiVersion+"/roles", true, requestedLoginId); List<Role> roles = mapper.readValue(roleList, TypeFactory.defaultInstance().constructCollectionType(List.class, Role.class)); return roles; @@ -150,7 +152,7 @@ public class RoleServiceCentralizedAccess implements RoleService { @Override public List<Role> getActiveRoles(String requestedLoginId) throws IOException { ObjectMapper mapper = new ObjectMapper(); - String roleString = restApiRequestBuilder.getViaREST("/activeRoles", true, requestedLoginId); + String roleString = restApiRequestBuilder.getViaREST(portalApiVersion+"/activeRoles", true, requestedLoginId); List<Role> roles = mapper.readValue(roleString, TypeFactory.defaultInstance().constructCollectionType(List.class, Role.class)); return roles; @@ -159,7 +161,7 @@ public class RoleServiceCentralizedAccess implements RoleService { @Override public RoleFunction getRoleFunction(String requestedLoginId, String code) throws IOException { ObjectMapper mapper = new ObjectMapper(); - String responseString = restApiRequestBuilder.getViaREST("/function/" + code, true, requestedLoginId); + String responseString = restApiRequestBuilder.getViaREST(portalApiVersion+"/function/" + code, true, requestedLoginId); RoleFunction roleFunction = new RoleFunction(); if (!responseString.isEmpty()) { roleFunction = mapper.readValue(responseString, RoleFunction.class); @@ -171,7 +173,7 @@ public class RoleServiceCentralizedAccess implements RoleService { public void saveRoleFunction(String requestedLoginId, RoleFunction domainRoleFunction) throws IOException { ObjectMapper mapper = new ObjectMapper(); String roleFunction = mapper.writeValueAsString(domainRoleFunction); - restApiRequestBuilder.postViaREST("/roleFunction", true, roleFunction, requestedLoginId); + restApiRequestBuilder.postViaREST(portalApiVersion+"/roleFunction", true, roleFunction, requestedLoginId); } @Override diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java index d1b05695..646581ae 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java @@ -51,6 +51,7 @@ import org.onap.portalsdk.core.domain.Role; import org.onap.portalsdk.core.domain.RoleFunction; import org.onap.portalsdk.core.domain.User; import org.onap.portalsdk.core.domain.UserApp; +import org.onap.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -64,6 +65,8 @@ public class UserServiceCentalizedImpl implements UserService { @Autowired private DataAccessService dataAccessService; + + private static String portalApiVersion = "/v1"; public DataAccessService getDataAccessService() { return dataAccessService; @@ -76,7 +79,7 @@ public class UserServiceCentalizedImpl implements UserService { @Override public User getUser(String id) throws IOException { String orgUserId = getUserByProfileId(id); - String responseString = restApiRequestBuilder.getViaREST("/user/" + orgUserId, true, id); + String responseString = restApiRequestBuilder.getViaREST(portalApiVersion+"/user/" + orgUserId, true, id); User user = userMapper(responseString); return user; } @@ -96,7 +99,6 @@ public class UserServiceCentalizedImpl implements UserService { public User userMapper(String res) throws IOException { ObjectMapper mapper = new ObjectMapper(); User user = mapper.readValue(res, User.class); - Set<RoleFunction> roleFunctionListNew = new HashSet<>(); SortedSet<UserApp> userAppSet = new TreeSet<>(); @SuppressWarnings("unchecked") Set<UserApp> setAppsObj = user.getUserApps(); @@ -108,6 +110,7 @@ public class UserServiceCentalizedImpl implements UserService { @SuppressWarnings("unchecked") Set<RoleFunction> roleFunctionList = role.getRoleFunctions(); Iterator<RoleFunction> roleFnIter = roleFunctionList.iterator(); + Set<RoleFunction> roleFunctionListNew = new HashSet<>(); while (roleFnIter.hasNext()) { Object nextValue = roleFnIter.next(); RoleFunction roleFunction = mapper.convertValue(nextValue, RoleFunction.class); |