diff options
author | sa282w <sa282w@att.com> | 2018-06-20 09:44:06 -0400 |
---|---|---|
committer | sa282w <sa282w@att.com> | 2018-06-21 10:19:07 -0400 |
commit | 27666ce5feb0e073f0e7dc43b4f1aa267a6b0975 (patch) | |
tree | b4eac5f8e3dcfd733ae487cd19d5bbd0785a580a /ecomp-sdk/epsdk-core | |
parent | 006a26eef7dc5def6e076af9a7c598603369a990 (diff) |
API Versioning for ECOMP Components in SDK
Issue-ID: PORTAL-263
Included the missing changes for V3 API's and changes from release/2.3.0
to release/2.4.0.
Change-Id: I42173a61ecb6ec29de537c3463d405e1c74d9aaa
Signed-off-by: sa282w <sa282w@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-core')
3 files changed, 3 insertions, 3 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 8b7d7fcb..09fb374a 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 @@ -72,7 +72,7 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS @Autowired private UserService userService; - private static String portalApiVersion = "/v1"; + private static String portalApiVersion = "/v3"; @Override public LoginBean findUser(LoginBean bean, String menuPropertiesFilename, 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 45ef1557..d44c9d72 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 @@ -65,7 +65,7 @@ public class UserServiceCentalizedImpl implements UserService { @Autowired private DataAccessService dataAccessService; - private static String portalApiVersion = "/v1"; + private static String portalApiVersion = "/v3"; public DataAccessService getDataAccessService() { return dataAccessService; diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java index 6feb5fe6..92adc193 100644 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java +++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java @@ -75,7 +75,7 @@ public class UserServiceCentalizedImplTest { params.put("user_id", new Long(id)); Mockito.when(dataAccessService.executeNamedQuery("getUserByProfileId", params, null)).thenReturn(orgUsreIds); String responseString = " { \"id\": 2, \"userApps\":[{\"app\":{\"id\":1},\"role\":{\"active\":true, \"roleFunctions\":[{\"id\":1}] } } ] }"; - Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + orgUserId, true, id)).thenReturn(responseString); + Mockito.when(restApiRequestBuilder.getViaREST("/v3/user/" + orgUserId, true, id)).thenReturn(responseString); User user = userServiceCentalizedImpl.getUser(id); Assert.assertNotNull(user); |