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 --- .../portalapp/controller/core/AngularAdminController.java | 3 ++- .../org/onap/portalapp/service/OnBoardingApiServiceImpl.java | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'ecomp-sdk/epsdk-app-common/src/main/java/org/onap') diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/AngularAdminController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/AngularAdminController.java index 138a805d..3aeb0147 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/AngularAdminController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/AngularAdminController.java @@ -49,8 +49,9 @@ import org.springframework.web.servlet.ModelAndView; @Controller @RequestMapping("/") public class AngularAdminController extends RestrictedBaseController{ + public static final String API_VERSION = "/v3"; - @RequestMapping(value = {"/userProfile" }, method = RequestMethod.GET) + @RequestMapping(value = {API_VERSION + "/userProfile" }, method = RequestMethod.GET) public ModelAndView view() { Map model = new HashMap<>(); return new ModelAndView("user_profile_list","model", model); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java index 46306817..871a3750 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java @@ -106,7 +106,7 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR .getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED); private static final String isCentralized = "remote"; - private static String portalApiVersion = "/v1"; + private static String portalApiVersion = "/v3"; public OnBoardingApiServiceImpl() { // Defend against null-pointer exception during server startup @@ -267,7 +267,7 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR if (isCentralized.equals(isAccessCentralized)) { List UsersList = new ArrayList<>(); List finalUsersList = new ArrayList<>(); - users_List = restApiRequestBuilder.getViaREST("/users", true, null); + users_List = restApiRequestBuilder.getViaREST(portalApiVersion + "/users", true, null); ObjectMapper mapper = new ObjectMapper(); UsersList = mapper.readValue(users_List, TypeFactory.defaultInstance().constructCollectionType(List.class, EcompUser.class)); @@ -476,4 +476,11 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR credentialsMap.put("appName", appName); return credentialsMap; } + + @Override + public Map getCredentials() throws PortalAPIException{ + return getAppCredentials(); + } + + } -- cgit 1.2.3-korg