summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-core/src
diff options
context:
space:
mode:
authorsa282w <sa282w@att.com>2018-06-22 12:09:50 -0400
committersa282w <sa282w@att.com>2018-06-27 12:44:16 -0400
commit3772c40e89085db751c2a4823084b0b1810b1b31 (patch)
tree1eb8b299896021a4eb740b8f5526e5af9fd5fd1a /ecomp-sdk/epsdk-core/src
parentcc409b55d11d971a4cc85df63be2fe32317c9082 (diff)
API Versioning for ECOMP Components in SDK
Issue-ID: PORTAL-263 Included the missing changes for V3 API's for UserService and LoginService and release/2.4.0 changes needed to be merged in master branch. Change-Id: Ic516255464d3edf637df3e8c64eafbf0dde8cee3 Signed-off-by: sa282w <sa282w@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-core/src')
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java2
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserServiceCentalizedImpl.java2
-rw-r--r--ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/service/UserServiceCentalizedImplTest.java2
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);