You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by co...@apache.org on 2012/04/16 15:58:20 UTC
svn commit: r1326619 - in /incubator/syncope/trunk/core/src:
main/java/org/syncope/core/rest/controller/UserController.java
test/java/org/syncope/core/rest/TaskTestITCase.java
test/java/org/syncope/core/rest/UserTestITCase.java
Author: coheigea
Date: Mon Apr 16 13:58:20 2012
New Revision: 1326619
URL: http://svn.apache.org/viewvc?rev=1326619&view=rev
Log:
[SYNCOPE-42] - Renamed UserController read & delete by username methods as per Francesco's suggestions
Modified:
incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/controller/UserController.java
incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java
incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/UserTestITCase.java
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/controller/UserController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/controller/UserController.java?rev=1326619&r1=1326618&r2=1326619&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/controller/UserController.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/controller/UserController.java Mon Apr 16 13:58:20 2012
@@ -196,9 +196,9 @@ public class UserController {
}
@PreAuthorize("hasRole('USER_READ')")
- @RequestMapping(method = RequestMethod.GET, value = "/read")
+ @RequestMapping(method = RequestMethod.GET, value = "/readByUsername/{username}")
@Transactional(readOnly = true, rollbackFor = {Throwable.class})
- public UserTO read(@RequestParam("username") final String username)
+ public UserTO read(@PathVariable final String username)
throws NotFoundException, UnauthorizedRoleException {
UserTO result = userDataBinder.getUserTO(username);
@@ -440,8 +440,8 @@ public class UserController {
}
@PreAuthorize("hasRole('USER_DELETE')")
- @RequestMapping(method = RequestMethod.GET, value = "/delete")
- public UserTO delete(@RequestParam("username") final String username)
+ @RequestMapping(method = RequestMethod.GET, value = "/deleteByUsername/{username}")
+ public UserTO delete(@PathVariable final String username)
throws NotFoundException, WorkflowException, PropagationException, UnauthorizedRoleException {
LOG.debug("User delete called with {}", username);
Modified: incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java?rev=1326619&r1=1326618&r2=1326619&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java (original)
+++ incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java Mon Apr 16 13:58:20 2012
@@ -318,7 +318,8 @@ public class TaskTestITCase extends Abst
assertTrue(Integer.valueOf(userTO.getAttributeMap().get("fullname").getValues().get(0)) <= 10);
// check for user template
- userTO = restTemplate.getForObject(BASE_URL + "user/read.json?username=test7", UserTO.class);
+ userTO =
+ restTemplate.getForObject(BASE_URL + "user/readByUsername/{username}.json", UserTO.class, "test7");
assertNotNull(userTO);
assertEquals("TYPE_OTHER", userTO.getAttributeMap().get("type").getValues().get(0));
assertEquals(2, userTO.getResources().size());
@@ -327,7 +328,8 @@ public class TaskTestITCase extends Abst
assertEquals(1, userTO.getMemberships().size());
assertTrue(userTO.getMemberships().get(0).getAttributeMap().containsKey("subscriptionDate"));
- userTO = restTemplate.getForObject(BASE_URL + "user/read.json?username=test8", UserTO.class);
+ userTO =
+ restTemplate.getForObject(BASE_URL + "user/readByUsername/{username}.json", UserTO.class, "test8");
assertNotNull(userTO);
assertEquals("TYPE_8", userTO.getAttributeMap().get("type").getValues().get(0));
@@ -340,11 +342,13 @@ public class TaskTestITCase extends Abst
// * expected disabled user test1
// * expected enabled user test2
- userTO = restTemplate.getForObject(BASE_URL + "user/read.json?username=test1", UserTO.class);
+ userTO =
+ restTemplate.getForObject(BASE_URL + "user/readByUsername/{username}.json", UserTO.class, "test1");
assertNotNull(userTO);
assertEquals("suspended", userTO.getStatus());
- userTO = restTemplate.getForObject(BASE_URL + "user/read.json?username=test3", UserTO.class);
+ userTO =
+ restTemplate.getForObject(BASE_URL + "user/readByUsername/{username}.json", UserTO.class, "test3");
assertNotNull(userTO);
assertEquals("active", userTO.getStatus());
}
@@ -416,7 +420,8 @@ public class TaskTestITCase extends Abst
assertNotNull(status);
assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful());
- final UserTO userTO = restTemplate.getForObject(BASE_URL + "user/read.json?username=testuser1", UserTO.class);
+ final UserTO userTO =
+ restTemplate.getForObject(BASE_URL + "user/readByUsername/{username}.json", UserTO.class, "testuser1");
assertNotNull(userTO);
assertEquals("reconciled@syncope.org", userTO.getAttributeMap().get("userId").getValues().get(0));
Modified: incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/UserTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/UserTestITCase.java?rev=1326619&r1=1326618&r2=1326619&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/UserTestITCase.java (original)
+++ incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/UserTestITCase.java Mon Apr 16 13:58:20 2012
@@ -779,7 +779,7 @@ public class UserTestITCase extends Abst
long id = userTO.getId();
userTO =
- restTemplate.getForObject(BASE_URL + "user/delete?username=" + userTO.getUsername(), UserTO.class);
+ restTemplate.getForObject(BASE_URL + "user/deleteByUsername/{username}.json", UserTO.class, userTO.getUsername());
assertNotNull(userTO);
assertEquals(id, userTO.getId());