diff options
Diffstat (limited to 'ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java')
-rw-r--r-- | ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java index a82517d8..208e8c3d 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java @@ -39,15 +39,19 @@ package org.onap.portalsdk.core.onboarding.crossapi; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +import org.onap.portalsdk.core.onboarding.exception.CipherUtilException; import org.onap.portalsdk.core.onboarding.exception.PortalAPIException; import org.onap.portalsdk.core.onboarding.rest.RestWebServiceClient; +import org.onap.portalsdk.core.onboarding.util.CipherUtil; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; import org.onap.portalsdk.core.restful.domain.EcompRole; @@ -65,6 +69,8 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { private String password; private String appName; IPortalRestCentralService portalRestCentralService; + public static final String API_VERSION = "/v4"; + private static String portalApiVersion = "/v3"; public PortalRestAPICentralServiceImpl() throws ServletException { String centralClassName = PortalApiProperties.getProperty(PortalApiConstants.PORTAL_API_IMPL_CLASS); @@ -99,7 +105,7 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { EcompUser user = new EcompUser(); String responseString = null; try { - responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/user/" + loginId, null, + responseString = RestWebServiceClient.getInstance().getPortalContent(API_VERSION + "/user/" + loginId, null, appName, null, username, password, true); logger.debug("responseString is: " + responseString); user = mapper.readValue(responseString, EcompUser.class); @@ -117,7 +123,7 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { List<EcompUser> usersList = new ArrayList<>(); String responseString = null; try { - responseString = RestWebServiceClient.getInstance().getPortalContent("/users", null, appName, null, + responseString = RestWebServiceClient.getInstance().getPortalContent(portalApiVersion + "/users", null, appName, null, username, password, true); logger.debug("responseString is: " + responseString); usersList = mapper.readValue(responseString, @@ -136,7 +142,7 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { List<EcompRole> rolesList = new ArrayList<>(); String responseString = null; try { - responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/roles", requestedLoginId, + responseString = RestWebServiceClient.getInstance().getPortalContent(API_VERSION + "/roles", requestedLoginId, appName, null, username, password, true); logger.debug("responseString is: " + responseString); rolesList = mapper.readValue(responseString, @@ -163,7 +169,7 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { EcompUser user = new EcompUser(); String responseString = null; try { - responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/user/" + loginId, null, + responseString = RestWebServiceClient.getInstance().getPortalContent(API_VERSION + "/user/" + loginId, null, appName, null, username, password, true); logger.debug("responseString is: " + responseString); user = mapper.readValue(responseString, EcompUser.class); @@ -196,5 +202,15 @@ public class PortalRestAPICentralServiceImpl implements IPortalRestAPIService { public String getUserId(HttpServletRequest request) throws PortalAPIException { return portalRestCentralService.getUserId(request); } + + @Override + public Map<String, String> getCredentials() throws PortalAPIException{ + Map<String, String> credentialsMap = new HashMap<>(); + + credentialsMap.put("username", username); + credentialsMap.put("password", password); + credentialsMap.put("appName", appName); + return credentialsMap; + } } |