From 22ed5d7b533cec97713c3b5aef37319d5dead6a3 Mon Sep 17 00:00:00 2001 From: sa282w Date: Wed, 2 May 2018 17:00:20 -0400 Subject: API Versioning for ECOMP Components in SDK Issue-ID: PORTAL-263 Included the api version changes for SDK. Change-Id: Ib81c5aabe585f6e2775e73a692153d1f286d1f45 Signed-off-by: sa282w --- .../core/service/FunctionalMenuListServiceCentralizedImpl.java | 3 ++- .../org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk') diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/FunctionalMenuListServiceCentralizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/FunctionalMenuListServiceCentralizedImpl.java index 1d503a81..cdcd1d7a 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/FunctionalMenuListServiceCentralizedImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/FunctionalMenuListServiceCentralizedImpl.java @@ -51,6 +51,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; public class FunctionalMenuListServiceCentralizedImpl implements FunctionalMenuListService { + private static String portalApiVersion = "/v3"; @Autowired private RestApiRequestBuilder restApiRequestBuilder; @@ -59,7 +60,7 @@ public class FunctionalMenuListServiceCentralizedImpl implements FunctionalMenuL public List getFunctionCDList(HttpServletRequest request) throws IOException { User user = UserUtils.getUserSession(request); ObjectMapper mapper = new ObjectMapper(); - String menuList = restApiRequestBuilder.getViaREST("/menuFunctions", true, user.getOrgUserId()); + String menuList = restApiRequestBuilder.getViaREST( portalApiVersion + "/menuFunctions", true, user.getOrgUserId()); List roleFunctionFinalList = mapper.readValue(menuList, TypeFactory.defaultInstance().constructCollectionType(List.class, String.class)); return roleFunctionFinalList; 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 88633abe..02a5ed30 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 @@ -61,7 +61,7 @@ public class RoleServiceCentralizedAccess implements RoleService { @Autowired private RestApiRequestBuilder restApiRequestBuilder; - private static String portalApiVersion = "/v1"; + private static String portalApiVersion = "/v3"; @Override public List getRoleFunctions(String loginId) throws IOException { @@ -137,7 +137,7 @@ public class RoleServiceCentralizedAccess implements RoleService { @Override public void deleteRole(String loginId, Role domainRole) throws IOException { Long roleId = domainRole.getId(); - restApiRequestBuilder.deleteViaRest("v2/deleteRole/" + roleId, true, null, loginId); + restApiRequestBuilder.deleteViaRest("v3/deleteRole/" + roleId, true, null, loginId); } @Override -- cgit 1.2.3-korg