diff options
| author |   Sunder Tattavarada <statta@research.att.com> | 2018-06-13 21:05:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-06-13 21:05:56 +0000 |
| commit | 006a26eef7dc5def6e076af9a7c598603369a990 (patch) | |
| tree | 63e663a5aee248c9b8c215eed70292d097ff0d77 | |
| parent | d26c4ce7bc799e5e263bbb66d68062a063708e1c (diff) | |
| parent | 8e2ec1973570cde1b3166410643bb86bc37f3eff (diff) | |
Merge "API Versioning for ECOMP Components in SDK" into release-2.4.0
2 files changed, 3 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/LoginExternalAuthServiceImpl.java b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/LoginExternalAuthServiceImpl.java index d2ccfc2e..063c207f 100644 --- a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/LoginExternalAuthServiceImpl.java +++ b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/LoginExternalAuthServiceImpl.java @@ -59,6 +59,7 @@ import org.onap.portalsdk.core.web.support.AppUtils; import org.onap.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service("loginExternalAuthService") public class LoginExternalAuthServiceImpl implements LoginExternalAuthService { @@ -79,6 +80,7 @@ public class LoginExternalAuthServiceImpl implements LoginExternalAuthService { @Override @SuppressWarnings("rawtypes") + @Transactional public LoginBean findUser(LoginBean bean, String menuPropertiesFilename, Map additionalParams, boolean matchPassword, HttpServletRequest request) throws Exception { 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 3aeb0147..138a805d 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,9 +49,8 @@ import org.springframework.web.servlet.ModelAndView; @Controller @RequestMapping("/") public class AngularAdminController extends RestrictedBaseController{ - public static final String API_VERSION = "/v3"; - @RequestMapping(value = {API_VERSION + "/userProfile" }, method = RequestMethod.GET) + @RequestMapping(value = {"/userProfile" }, method = RequestMethod.GET) public ModelAndView view() { Map<String, Object> model = new HashMap<>(); return new ModelAndView("user_profile_list","model", model); |