Repository: syncope Updated Branches: refs/heads/master 6ea34cd36 -> b738d3e94
http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AnyObjectITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AnyObjectITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AnyObjectITCase.java index 78bb011..c044187 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AnyObjectITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AnyObjectITCase.java @@ -26,7 +26,6 @@ import static org.junit.Assert.fail; import java.util.Set; import javax.ws.rs.core.Response; -import org.apache.syncope.client.lib.SyncopeClient; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.patch.AnyObjectPatch; @@ -36,6 +35,7 @@ import org.apache.syncope.common.lib.to.AttrTO; import org.apache.syncope.common.lib.to.PagedResult; import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.SchemaType; +import org.apache.syncope.common.rest.api.beans.AnyListQuery; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; @@ -93,8 +93,8 @@ public class AnyObjectITCase extends AbstractITCase { @Test public void list() { - PagedResult<AnyObjectTO> anyObjectTOs = anyObjectService.list("PRINTER", SyncopeClient.getAnyListQueryBuilder(). - realm(SyncopeConstants.ROOT_REALM).build()); + PagedResult<AnyObjectTO> anyObjectTOs = anyObjectService.list( + "PRINTER", new AnyListQuery.Builder().realm(SyncopeConstants.ROOT_REALM).build()); assertNotNull(anyObjectTOs); assertTrue(anyObjectTOs.getResult().size() >= 2); for (AnyObjectTO anyObjectTO : anyObjectTOs.getResult()) { http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java index a9dda8d..580a209 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AuthenticationITCase.java @@ -38,9 +38,9 @@ import org.apache.syncope.client.lib.SyncopeClient; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.patch.DeassociationPatch; -import org.apache.syncope.common.lib.patch.LongPatchItem; import org.apache.syncope.common.lib.patch.PasswordPatch; import org.apache.syncope.common.lib.patch.StatusPatch; +import org.apache.syncope.common.lib.patch.StringPatchItem; import org.apache.syncope.common.lib.patch.StringReplacePatchItem; import org.apache.syncope.common.lib.patch.UserPatch; import org.apache.syncope.common.lib.to.AnyObjectTO; @@ -65,10 +65,10 @@ import org.apache.syncope.common.lib.types.SchemaType; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.syncope.common.lib.types.StatusPatchType; import org.apache.syncope.common.rest.api.RESTHeaders; +import org.apache.syncope.common.rest.api.beans.AnySearchQuery; import org.apache.syncope.common.rest.api.service.AnyObjectService; import org.apache.syncope.common.rest.api.service.SchemaService; import org.apache.syncope.common.rest.api.service.UserService; -import org.apache.syncope.core.misc.security.DelegatedAdministrationException; import org.apache.syncope.core.misc.security.Encryptor; import org.junit.Assume; import org.junit.FixMethodOrder; @@ -167,7 +167,7 @@ public class AuthenticationITCase extends AbstractITCase { @Test public void testUserRead() { UserTO userTO = UserITCase.getUniqueSampleTO("[email protected]"); - userTO.getRoles().add(2L); + userTO.getRoles().add("User manager"); userTO = createUser(userTO).getAny(); assertNotNull(userTO); @@ -192,7 +192,7 @@ public class AuthenticationITCase extends AbstractITCase { @Test public void testUserSearch() { UserTO userTO = UserITCase.getUniqueSampleTO("[email protected]"); - userTO.getRoles().add(1L); + userTO.getRoles().add("User reviewer"); userTO = createUser(userTO).getAny(); assertNotNull(userTO); @@ -203,7 +203,7 @@ public class AuthenticationITCase extends AbstractITCase { getService(UserService.class); PagedResult<UserTO> matchedUsers = userService2.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().isNotNull("key").query()).build()); assertNotNull(matchedUsers); assertFalse(matchedUsers.getResult().isEmpty()); @@ -223,7 +223,7 @@ public class AuthenticationITCase extends AbstractITCase { UserService userService3 = clientFactory.create("puccini", ADMIN_PWD).getService(UserService.class); matchedUsers = userService3.search( - SyncopeClient.getAnySearchQueryBuilder().realm("/even/two"). + new AnySearchQuery.Builder().realm("/even/two"). fiql(SyncopeClient.getUserSearchConditionBuilder().isNotNull("loginDate").query()).build()); assertNotNull(matchedUsers); assertTrue(CollectionUtils.matchesAll(matchedUsers.getResult(), new Predicate<UserTO>() { @@ -237,12 +237,12 @@ public class AuthenticationITCase extends AbstractITCase { @Test public void delegatedUserCRUD() { - Long roleKey = null; + String roleKey = null; Long delegatedAdminKey = null; try { // 1. create role for full user administration, under realm /even/two RoleTO role = new RoleTO(); - role.setName("Delegated user admin"); + role.setKey("Delegated user admin"); role.getEntitlements().add(StandardEntitlement.USER_CREATE); role.getEntitlements().add(StandardEntitlement.USER_UPDATE); role.getEntitlements().add(StandardEntitlement.USER_DELETE); @@ -250,7 +250,7 @@ public class AuthenticationITCase extends AbstractITCase { role.getEntitlements().add(StandardEntitlement.USER_READ); role.getRealms().add("/even/two"); - roleKey = Long.valueOf(roleService.create(role).getHeaderString(RESTHeaders.RESOURCE_KEY)); + roleKey = roleService.create(role).getHeaderString(RESTHeaders.RESOURCE_KEY); assertNotNull(roleKey); // 2. as admin, create delegated admin user, and assign the role just created @@ -327,7 +327,7 @@ public class AuthenticationITCase extends AbstractITCase { @Test public void checkFailedLogins() { UserTO userTO = UserITCase.getUniqueSampleTO("[email protected]"); - userTO.getRoles().add(2L); + userTO.getRoles().add("User manager"); userTO = createUser(userTO).getAny(); assertNotNull(userTO); @@ -353,7 +353,7 @@ public class AuthenticationITCase extends AbstractITCase { public void checkUserSuspension() { UserTO userTO = UserITCase.getUniqueSampleTO("[email protected]"); userTO.setRealm("/odd"); - userTO.getRoles().add(2L); + userTO.getRoles().add("User manager"); userTO = createUser(userTO).getAny(); long userKey = userTO.getKey(); @@ -448,7 +448,7 @@ public class AuthenticationITCase extends AbstractITCase { // 4. give create entitlement for the any type just created RoleTO role = new RoleTO(); - role.setName("role" + getUUIDString()); + role.setKey("role" + getUUIDString()); role.getRealms().add(SyncopeConstants.ROOT_REALM); role.getEntitlements().add(anyTypeKey + "_READ"); role.getEntitlements().add(anyTypeKey + "_CREATE"); @@ -457,7 +457,7 @@ public class AuthenticationITCase extends AbstractITCase { UserTO bellini = readUser("bellini"); UserPatch patch = new UserPatch(); patch.setKey(bellini.getKey()); - patch.getRoles().add(new LongPatchItem.Builder(). + patch.getRoles().add(new StringPatchItem.Builder(). operation(PatchOperation.ADD_REPLACE).value(role.getKey()).build()); bellini = updateUser(patch).getAny(); assertTrue(bellini.getRoles().contains(role.getKey())); http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java index ac941b7..766ed0a 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java @@ -31,6 +31,7 @@ import org.apache.syncope.common.lib.to.DerSchemaTO; import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.EntityViolationType; import org.apache.syncope.common.lib.types.SchemaType; +import org.apache.syncope.common.rest.api.beans.SchemaQuery; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; @@ -40,9 +41,9 @@ public class DerSchemaITCase extends AbstractITCase { @Test public void list() { - List<DerSchemaTO> derivedSchemas = schemaService.list(SchemaType.DERIVED, null); - assertFalse(derivedSchemas.isEmpty()); - for (DerSchemaTO derivedSchemaTO : derivedSchemas) { + List<DerSchemaTO> derSchemas = schemaService.list(SchemaType.DERIVED, new SchemaQuery.Builder().build()); + assertFalse(derSchemas.isEmpty()); + for (DerSchemaTO derivedSchemaTO : derSchemas) { assertNotNull(derivedSchemaTO); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ExceptionMapperITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ExceptionMapperITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ExceptionMapperITCase.java index 924a24b..da0295c 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ExceptionMapperITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ExceptionMapperITCase.java @@ -28,8 +28,8 @@ import org.apache.commons.io.IOUtils; import org.apache.syncope.common.lib.SyncopeClientCompositeException; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.to.AnyTypeClassTO; +import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.PlainSchemaTO; -import org.apache.syncope.common.lib.to.RoleTO; import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.AttrSchemaType; import org.apache.syncope.common.lib.types.SchemaType; @@ -109,18 +109,21 @@ public class ExceptionMapperITCase extends AbstractITCase { } @Test - public void sameRoleName() { - // Create the first role - RoleTO roleTO1 = new RoleTO(); - String roleUUID = getUUIDString(); - roleTO1.setName("child1" + roleUUID); - createRole(roleTO1); - - // Create the second role, with the same parent and the same role of roleTO1 - RoleTO roleTO2 = new RoleTO(); - roleTO2.setName("child1" + roleUUID); + public void sameGroupName() { + String groupUUID = getUUIDString(); + + // Create the first group + GroupTO groupTO1 = new GroupTO(); + groupTO1.setName("child1" + groupUUID); + groupTO1.setRealm(SyncopeConstants.ROOT_REALM); + createGroup(groupTO1); + + // Create the second group, with the same name of groupTO1 + GroupTO groupTO2 = new GroupTO(); + groupTO2.setName("child1" + groupUUID); + groupTO2.setRealm(SyncopeConstants.ROOT_REALM); try { - createRole(roleTO2); + createGroup(groupTO2); fail(); } catch (Exception e) { String message = ERROR_MESSAGES.getProperty("errMessage.UniqueConstraintViolation"); http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java index d580152..f5a503b 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/GroupITCase.java @@ -76,6 +76,8 @@ import org.apache.syncope.common.lib.types.ResourceDeassociationAction; import org.apache.syncope.common.lib.types.SchemaType; import org.apache.syncope.common.rest.api.Preference; import org.apache.syncope.common.rest.api.RESTHeaders; +import org.apache.syncope.common.rest.api.beans.AnyListQuery; +import org.apache.syncope.common.rest.api.beans.AnySearchQuery; import org.apache.syncope.common.rest.api.service.GroupService; import org.junit.FixMethodOrder; import org.junit.Test; @@ -159,7 +161,7 @@ public class GroupITCase extends AbstractITCase { @Test public void list() { PagedResult<GroupTO> groupTOs = - groupService.list(SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); + groupService.list(new AnyListQuery.Builder().realm(SyncopeConstants.ROOT_REALM).build()); assertNotNull(groupTOs); assertTrue(groupTOs.getResult().size() >= 8); for (GroupTO groupTO : groupTOs.getResult()) { @@ -558,16 +560,14 @@ public class GroupITCase extends AbstractITCase { public void anonymous() { GroupService unauthenticated = clientFactory.create().getService(GroupService.class); try { - unauthenticated. - list(SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); + unauthenticated.list(new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM).build()); fail(); } catch (AccessControlException e) { assertNotNull(e); } GroupService anonymous = clientFactory.create(ANONYMOUS_UNAME, ANONYMOUS_KEY).getService(GroupService.class); - assertFalse(anonymous.list(SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). - build()). + assertFalse(anonymous.list(new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM).build()). getResult().isEmpty()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java index 5aac6c0..d675692 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java @@ -50,6 +50,8 @@ import org.apache.syncope.common.lib.types.MappingPurpose; import org.apache.syncope.common.lib.types.PropagationTaskExecStatus; import org.apache.syncope.common.lib.types.SchemaType; import org.apache.syncope.common.lib.types.SyncMode; +import org.apache.syncope.common.rest.api.beans.AnySearchQuery; +import org.apache.syncope.common.rest.api.beans.SchemaQuery; import org.apache.syncope.common.rest.api.service.ConnectorService; import org.apache.syncope.common.rest.api.service.DomainService; import org.apache.syncope.common.rest.api.service.LoggerService; @@ -101,7 +103,8 @@ public class MultitenancyITCase extends AbstractITCase { @Test public void readPlainSchemas() { - assertEquals(17, adminClient.getService(SchemaService.class).list(SchemaType.PLAIN, null).size()); + assertEquals(17, adminClient.getService(SchemaService.class). + list(SchemaType.PLAIN, new SchemaQuery.Builder().build()).size()); } @Test @@ -209,7 +212,7 @@ public class MultitenancyITCase extends AbstractITCase { // verify that synchronized user is found PagedResult<UserTO> matchingUsers = adminClient.getService(UserService.class).search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").equalTo("syncFromLDAP").query()). build()); assertNotNull(matchingUsers); http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java index 2a75805..7f46848 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.security.AccessControlException; import java.util.List; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.Response; @@ -44,7 +43,7 @@ import org.apache.syncope.common.lib.types.CipherAlgorithm; import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.EntityViolationType; import org.apache.syncope.common.lib.types.SchemaType; -import org.apache.syncope.common.rest.api.service.SchemaService; +import org.apache.syncope.common.rest.api.beans.SchemaQuery; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; @@ -159,7 +158,7 @@ public class PlainSchemaITCase extends AbstractITCase { @Test public void list() { - List<PlainSchemaTO> schemas = schemaService.list(SchemaType.PLAIN, null); + List<PlainSchemaTO> schemas = schemaService.list(SchemaType.PLAIN, new SchemaQuery.Builder().build()); assertFalse(schemas.isEmpty()); for (PlainSchemaTO schemaTO : schemas) { assertNotNull(schemaTO); @@ -169,8 +168,9 @@ public class PlainSchemaITCase extends AbstractITCase { @Test public void listByAnyTypeClass() { final String clazz = anyTypeService.read(AnyTypeKind.USER.name()).getClasses().get(0); - - List<PlainSchemaTO> userSchemas = schemaService.list(SchemaType.PLAIN, clazz); + + List<PlainSchemaTO> userSchemas = schemaService.list( + SchemaType.PLAIN, new SchemaQuery.Builder().anyTypeClass(clazz).build()); assertTrue(CollectionUtils.exists(userSchemas, new Predicate<PlainSchemaTO>() { @@ -332,18 +332,4 @@ public class PlainSchemaITCase extends AbstractITCase { assertTrue(e.getElements().iterator().next().contains(EntityViolationType.InvalidName.name())); } } - - @Test - public void anonymous() { - SchemaService unauthenticated = clientFactory.create().getService(SchemaService.class); - try { - unauthenticated.list(SchemaType.VIRTUAL, null); - fail(); - } catch (AccessControlException e) { - assertNotNull(e); - } - - SchemaService anonymous = clientFactory.create(ANONYMOUS_UNAME, ANONYMOUS_KEY).getService(SchemaService.class); - assertFalse(anonymous.list(SchemaType.VIRTUAL, null).isEmpty()); - } } http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java index 7f2964f..ec0f275 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.apache.syncope.client.lib.SyncopeClient; import org.apache.syncope.common.lib.to.AbstractTaskTO; import org.apache.syncope.common.lib.to.BulkAction; import org.apache.syncope.common.lib.to.PagedResult; @@ -33,6 +32,7 @@ import org.apache.syncope.common.lib.to.PropagationTaskTO; import org.apache.syncope.common.lib.to.TaskExecTO; import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.TaskType; +import org.apache.syncope.common.rest.api.beans.TaskQuery; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; @@ -44,7 +44,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase { public void paginatedList() { PagedResult<PropagationTaskTO> tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(2).build()); + new TaskQuery.Builder().page(1).size(2).build()); assertNotNull(tasks); assertEquals(2, tasks.getResult().size()); @@ -54,7 +54,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase { tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(2).size(2).build()); + new TaskQuery.Builder().page(2).size(2).build()); assertNotNull(tasks); assertEquals(2, tasks.getPage()); assertEquals(2, tasks.getResult().size()); @@ -65,7 +65,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase { tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1000).size(2).build()); + new TaskQuery.Builder().page(1000).size(2).build()); assertNotNull(tasks); assertTrue(tasks.getResult().isEmpty()); } @@ -87,7 +87,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase { @Test public void bulkAction() { PagedResult<PropagationTaskTO> before = taskService.list( - TaskType.PROPAGATION, SyncopeClient.getTaskQueryBuilder().build()); + TaskType.PROPAGATION, new TaskQuery.Builder().build()); // create user with testdb resource UserTO userTO = UserITCase.getUniqueSampleTO("[email protected]"); @@ -95,7 +95,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase { createUser(userTO); List<PropagationTaskTO> after = new ArrayList<>( - taskService.<PropagationTaskTO>list(TaskType.PROPAGATION, SyncopeClient.getTaskQueryBuilder().build()). + taskService.<PropagationTaskTO>list(TaskType.PROPAGATION, new TaskQuery.Builder().build()). getResult()); after.removeAll(before.getResult()); assertFalse(after.isEmpty()); @@ -109,7 +109,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase { taskService.bulk(bulkAction); - assertFalse(taskService.list(TaskType.PROPAGATION, SyncopeClient.getTaskQueryBuilder().build()).getResult(). + assertFalse(taskService.list(TaskType.PROPAGATION, new TaskQuery.Builder().build()).getResult(). containsAll(after)); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java index bf294f6..3a907b2 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java @@ -52,6 +52,7 @@ import org.apache.syncope.common.lib.types.SchemaType; import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.common.lib.types.TraceLevel; import org.apache.syncope.common.lib.types.UnmatchingRule; +import org.apache.syncope.common.rest.api.beans.TaskQuery; import org.apache.syncope.common.rest.api.service.NotificationService; import org.apache.syncope.common.rest.api.service.ResourceService; import org.apache.syncope.common.rest.api.service.TaskService; @@ -79,8 +80,7 @@ public class PushTaskITCase extends AbstractTaskITCase { @Test public void list() { - PagedResult<PushTaskTO> tasks = taskService.list( - TaskType.PUSH, SyncopeClient.getTaskQueryBuilder().build()); + PagedResult<PushTaskTO> tasks = taskService.list(TaskType.PUSH, new TaskQuery.Builder().build()); assertFalse(tasks.getResult().isEmpty()); for (AbstractTaskTO task : tasks.getResult()) { if (!(task instanceof PushTaskTO)) { http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java index 99be00a..f2c940c 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java @@ -35,8 +35,6 @@ import java.util.Set; import javax.ws.rs.core.Response; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Transformer; -import org.apache.syncope.client.lib.SyncopeClient; -import org.apache.syncope.client.lib.builders.ConnObjectTOListQueryBuilder; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.BulkAction; import org.apache.syncope.common.lib.to.ConnObjectTO; @@ -53,6 +51,7 @@ import org.apache.syncope.common.lib.types.ConnConfProperty; import org.apache.syncope.common.lib.types.EntityViolationType; import org.apache.syncope.common.lib.types.IntMappingType; import org.apache.syncope.common.lib.types.MappingPurpose; +import org.apache.syncope.common.rest.api.beans.ConnObjectTOListQuery; import org.apache.syncope.common.rest.api.service.ResourceService; import org.identityconnectors.framework.common.objects.ObjectClass; import org.junit.FixMethodOrder; @@ -542,7 +541,7 @@ public class ResourceITCase extends AbstractITCase { int totalRead = 0; Set<String> read = new HashSet<>(); try { - ConnObjectTOListQueryBuilder builder = SyncopeClient.getConnObjectTOListQueryBuilder().size(10); + ConnObjectTOListQuery.Builder builder = new ConnObjectTOListQuery.Builder().size(10); PagedConnObjectTOResult list; do { list = null; http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/RoleITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/RoleITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/RoleITCase.java index c745324..a44b5f5 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/RoleITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/RoleITCase.java @@ -41,7 +41,7 @@ public class RoleITCase extends AbstractITCase { public static RoleTO getSampleRoleTO(final String name) { RoleTO role = new RoleTO(); - role.setName(name + getUUIDString()); + role.setKey(name + getUUIDString()); role.getRealms().add("/even"); role.getEntitlements().add(StandardEntitlement.LOG_SET_LEVEL); @@ -60,7 +60,7 @@ public class RoleITCase extends AbstractITCase { @Test public void read() { - RoleTO roleTO = roleService.read(3L); + RoleTO roleTO = roleService.read("Other"); assertNotNull(roleTO); assertTrue(roleTO.getEntitlements().contains(StandardEntitlement.GROUP_READ)); } @@ -80,7 +80,7 @@ public class RoleITCase extends AbstractITCase { assertEquals(ClientExceptionType.InvalidRole, e.getType()); } - role.setName("new" + getUUIDString()); + role.setKey("new" + getUUIDString()); role = createRole(role); assertNotNull(role); } http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java index 614f5d3..a8f4d23 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java @@ -28,7 +28,6 @@ import static org.junit.Assert.fail; import java.util.List; import java.util.Set; import javax.ws.rs.core.Response; -import org.apache.syncope.client.lib.SyncopeClient; import org.apache.syncope.common.lib.to.AbstractTaskTO; import org.apache.syncope.common.lib.to.PagedResult; import org.apache.syncope.common.lib.to.PushTaskTO; @@ -38,6 +37,7 @@ import org.apache.syncope.common.lib.to.TaskExecTO; import org.apache.syncope.common.lib.types.JobAction; import org.apache.syncope.common.lib.types.JobStatusType; import org.apache.syncope.common.lib.types.TaskType; +import org.apache.syncope.common.rest.api.beans.TaskQuery; import org.apache.syncope.common.rest.api.service.TaskService; import org.junit.FixMethodOrder; import org.junit.Test; @@ -56,7 +56,7 @@ public class SchedTaskITCase extends AbstractTaskITCase { @Test public void list() { PagedResult<SchedTaskTO> tasks = - taskService.list(TaskType.SCHEDULED, SyncopeClient.getTaskQueryBuilder().build()); + taskService.list(TaskType.SCHEDULED, new TaskQuery.Builder().build()); assertFalse(tasks.getResult().isEmpty()); for (AbstractTaskTO task : tasks.getResult()) { if (!(task instanceof SchedTaskTO) || task instanceof SyncTaskTO || task instanceof PushTaskTO) { http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java index 59d158d..38624b9 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SearchITCase.java @@ -34,6 +34,7 @@ import org.apache.syncope.common.lib.to.PagedResult; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.RoleTO; import org.apache.syncope.common.lib.to.UserTO; +import org.apache.syncope.common.rest.api.beans.AnySearchQuery; import org.apache.syncope.common.rest.api.service.RoleService; import org.junit.FixMethodOrder; import org.junit.Test; @@ -46,7 +47,7 @@ public class SearchITCase extends AbstractITCase { public void searchUser() { // LIKE PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder(). is("fullname").equalTo("*o*").and("fullname").equalTo("*i*").query()).build()); assertNotNull(matchingUsers); @@ -58,7 +59,7 @@ public class SearchITCase extends AbstractITCase { // ISNULL matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().isNull("loginDate").query()).build()); assertNotNull(matchingUsers); assertFalse(matchingUsers.getResult().isEmpty()); @@ -76,7 +77,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByUsernameAndKey() { PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder(). is("username").equalTo("rossini").and("key").lessThan(2).query()).build()); assertNotNull(matchingUsers); @@ -88,7 +89,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByGroupNameAndKey() { PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder(). is("name").equalTo("root").and("key").lessThan(2).query()).build()); assertNotNull(matchingGroups); @@ -100,7 +101,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByGroup() { PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().inGroups(1L).query()). build()); assertNotNull(matchingUsers); @@ -123,7 +124,7 @@ public class SearchITCase extends AbstractITCase { assertNotNull(group); PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().inGroups(group.getKey()).query()). build()); assertNotNull(matchingUsers); @@ -141,8 +142,8 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByRole() { PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). - fiql(SyncopeClient.getUserSearchConditionBuilder().inRoles(3L).query()). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). + fiql(SyncopeClient.getUserSearchConditionBuilder().inRoles("Other").query()). build()); assertNotNull(matchingUsers); assertFalse(matchingUsers.getResult().isEmpty()); @@ -165,7 +166,7 @@ public class SearchITCase extends AbstractITCase { assertNotNull(role); PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().inRoles(role.getKey()).query()). build()); assertNotNull(matchingUsers); @@ -183,7 +184,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchUserByResourceName() { PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().hasResources(RESOURCE_NAME_MAPPINGS2).query()). build()); assertNotNull(matchingUsers); @@ -202,7 +203,7 @@ public class SearchITCase extends AbstractITCase { public void paginatedSearch() { // LIKE PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder(). is("fullname").equalTo("*o*").and("fullname").equalTo("*i*").query()).page(1).size(2).build()); assertNotNull(matchingUsers); @@ -214,7 +215,7 @@ public class SearchITCase extends AbstractITCase { // ISNULL matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().isNull("loginDate").query()).page(2).size(2). build()); assertNotNull(matchingUsers); @@ -225,7 +226,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByBooleanAnyCond() { PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getGroupSearchConditionBuilder().is("show").equalTo("true").query()).build()); assertNotNull(matchingGroups); assertFalse(matchingGroups.getResult().isEmpty()); @@ -234,7 +235,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByRelationshipAnyCond() { PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getGroupSearchConditionBuilder().is("userOwner").equalTo(5).query()).build()); assertNotNull(matchingGroups); assertEquals(1, matchingGroups.getResult().size()); @@ -244,7 +245,7 @@ public class SearchITCase extends AbstractITCase { @Test public void nested() { PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql("((fullname==*o*,fullname==*i*);$resources!=ws-target-resource-1)").page(1).size(2).build()); assertNotNull(matchingUsers); @@ -257,7 +258,7 @@ public class SearchITCase extends AbstractITCase { @Test public void searchByType() { PagedResult<AnyObjectTO> matching = anyObjectService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getAnyObjectSearchConditionBuilder().type("PRINTER").query()).build()); assertNotNull(matching); @@ -267,7 +268,7 @@ public class SearchITCase extends AbstractITCase { } matching = anyObjectService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getAnyObjectSearchConditionBuilder().type("UNEXISTING").query()).build()); assertNotNull(matching); @@ -277,7 +278,7 @@ public class SearchITCase extends AbstractITCase { @Test public void orderBy() { PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().is("userId").equalTo("*@apache.org").query()). orderBy(SyncopeClient.getOrderByClauseBuilder().asc("status").desc("firstname").build()).build()); assertNotNull(matchingUsers); http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java index 7d2d13b..e94001f 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java @@ -64,6 +64,8 @@ import org.apache.syncope.common.lib.types.PropagationTaskExecStatus; import org.apache.syncope.common.lib.types.ResourceDeassociationAction; import org.apache.syncope.common.lib.types.SyncMode; import org.apache.syncope.common.lib.types.TaskType; +import org.apache.syncope.common.rest.api.beans.AnySearchQuery; +import org.apache.syncope.common.rest.api.beans.TaskQuery; import org.apache.syncope.common.rest.api.service.TaskService; import org.apache.syncope.core.misc.security.Encryptor; import org.apache.syncope.core.provisioning.java.sync.DBPasswordSyncActions; @@ -95,8 +97,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { @Test public void list() { - PagedResult<SyncTaskTO> tasks = - taskService.list(TaskType.SYNCHRONIZATION, SyncopeClient.getTaskQueryBuilder().build()); + PagedResult<SyncTaskTO> tasks = taskService.list(TaskType.SYNCHRONIZATION, new TaskQuery.Builder().build()); assertFalse(tasks.getResult().isEmpty()); for (AbstractTaskTO task : tasks.getResult()) { if (!(task instanceof SyncTaskTO)) { @@ -163,7 +164,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // ----------------------------- try { int usersPre = userService.list( - SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). page(1).size(1).build()).getTotalCount(); assertNotNull(usersPre); @@ -219,7 +220,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // check for sync results int usersPost = userService.list( - SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). page(1).size(1).build()).getTotalCount(); assertNotNull(usersPost); assertEquals(usersPre + 8, usersPost); @@ -294,7 +295,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { */ private void ldapCleanup() { PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getGroupSearchConditionBuilder().is("name").equalTo("testLDAPGroup").query()). build()); if (matchingGroups.getSize() > 0) { @@ -308,7 +309,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { } } PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").equalTo("syncFromLDAP").query()). build()); if (matchingUsers.getSize() > 0) { @@ -336,7 +337,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // 2. verify that synchronized group is found PagedResult<GroupTO> matchingGroups = groupService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getGroupSearchConditionBuilder().is("name").equalTo("testLDAPGroup").query()). build()); assertNotNull(matchingGroups); @@ -344,7 +345,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // 3. verify that synchronized user is found PagedResult<UserTO> matchingUsers = userService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").equalTo("syncFromLDAP").query()). build()); assertNotNull(matchingUsers); @@ -413,7 +414,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // 3. unlink any existing printer and delete from Syncope (printer is now only on external resource) PagedResult<AnyObjectTO> matchingPrinters = anyObjectService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getAnyObjectSearchConditionBuilder().type("PRINTER").and(). is("location").equalTo("sync*").query()).build()); assertTrue(matchingPrinters.getSize() > 0); @@ -432,7 +433,7 @@ public class SyncTaskITCase extends AbstractTaskITCase { // 5. verify that printer was re-created in Syncope (implies that location does not start with given prefix, // hence PrefixMappingItemTransformer was applied during sync) matchingPrinters = anyObjectService.search( - SyncopeClient.getAnySearchQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getAnyObjectSearchConditionBuilder().type("PRINTER").and(). is("location").equalTo("sync*").query()).build()); assertTrue(matchingPrinters.getSize() > 0); http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java index c502ed1..e8ccf7d 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java @@ -91,6 +91,8 @@ import org.apache.syncope.common.lib.types.StatusPatchType; import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.common.rest.api.Preference; import org.apache.syncope.common.rest.api.RESTHeaders; +import org.apache.syncope.common.rest.api.beans.AnySearchQuery; +import org.apache.syncope.common.rest.api.beans.TaskQuery; import org.apache.syncope.common.rest.api.service.ResourceService; import org.apache.syncope.common.rest.api.service.UserSelfService; import org.apache.syncope.common.rest.api.service.UserService; @@ -149,7 +151,7 @@ public class UserITCase extends AbstractITCase { // get task list PagedResult<PropagationTaskTO> tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()); + new TaskQuery.Builder().page(1).size(1).build()); assertNotNull(tasks); assertFalse(tasks.getResult().isEmpty()); @@ -165,7 +167,7 @@ public class UserITCase extends AbstractITCase { // get the new task list tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()); + new TaskQuery.Builder().page(1).size(1).build()); assertNotNull(tasks); assertFalse(tasks.getResult().isEmpty()); @@ -355,7 +357,7 @@ public class UserITCase extends AbstractITCase { // get task list PagedResult<PropagationTaskTO> tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()); + new TaskQuery.Builder().page(1).size(1).build()); assertNotNull(tasks); assertFalse(tasks.getResult().isEmpty()); @@ -397,7 +399,7 @@ public class UserITCase extends AbstractITCase { // get the new task list tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()); + new TaskQuery.Builder().page(1).size(1).build()); assertNotNull(tasks); assertFalse(tasks.getResult().isEmpty()); @@ -543,7 +545,7 @@ public class UserITCase extends AbstractITCase { @Test public void list() { PagedResult<UserTO> users = userService.list( - SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).build()); + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM).build()); assertNotNull(users); assertFalse(users.getResult().isEmpty()); @@ -555,7 +557,7 @@ public class UserITCase extends AbstractITCase { @Test public void paginatedList() { PagedResult<UserTO> users = userService.list( - SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM).page(1).size(2).build()); + new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM).page(1).size(2).build()); assertNotNull(users); assertFalse(users.getResult().isEmpty()); assertEquals(2, users.getResult().size()); @@ -564,13 +566,13 @@ public class UserITCase extends AbstractITCase { assertNotNull(user); } - users = userService.list(SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + users = userService.list(new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). page(2).size(2).build()); assertNotNull(users); assertEquals(2, users.getPage()); assertEquals(2, users.getResult().size()); - users = userService.list(SyncopeClient.getAnyListQueryBuilder().realm(SyncopeConstants.ROOT_REALM). + users = userService.list(new AnySearchQuery.Builder().realm(SyncopeConstants.ROOT_REALM). page(100).size(2).build()); assertNotNull(users); assertTrue(users.getResult().isEmpty()); @@ -692,7 +694,7 @@ public class UserITCase extends AbstractITCase { @Test public void updatePasswordOnly() { int beforeTasks = taskService.list(TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()).getTotalCount(); + new TaskQuery.Builder().page(1).size(1).build()).getTotalCount(); assertFalse(beforeTasks <= 0); UserTO userTO = getUniqueSampleTO("[email protected]"); @@ -710,7 +712,7 @@ public class UserITCase extends AbstractITCase { assertNotNull(userTO.getChangePwdDate()); int afterTasks = taskService.list(TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()).getTotalCount(); + new TaskQuery.Builder().page(1).size(1).build()).getTotalCount(); assertFalse(beforeTasks <= 0); assertTrue(beforeTasks < afterTasks); @@ -722,7 +724,7 @@ public class UserITCase extends AbstractITCase { // get task list PagedResult<PropagationTaskTO> tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()); + new TaskQuery.Builder().page(1).size(1).build()); assertNotNull(tasks); assertFalse(tasks.getResult().isEmpty()); @@ -743,7 +745,7 @@ public class UserITCase extends AbstractITCase { // get the new task list tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()); + new TaskQuery.Builder().page(1).size(1).build()); assertNotNull(tasks); assertFalse(tasks.getResult().isEmpty()); @@ -769,7 +771,7 @@ public class UserITCase extends AbstractITCase { // get the new task list tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()); + new TaskQuery.Builder().page(1).size(1).build()); maxKey = newMaxKey; newMaxKey = tasks.getResult().iterator().next().getKey(); @@ -791,7 +793,7 @@ public class UserITCase extends AbstractITCase { // get the new task list tasks = taskService.list( TaskType.PROPAGATION, - SyncopeClient.getTaskQueryBuilder().page(1).size(1).build()); + new TaskQuery.Builder().page(1).size(1).build()); maxKey = newMaxKey; newMaxKey = tasks.getResult().iterator().next().getKey(); http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserWorkflowITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserWorkflowITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserWorkflowITCase.java index cb0bdce..150b0bc 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserWorkflowITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserWorkflowITCase.java @@ -30,8 +30,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; import org.apache.syncope.common.lib.SyncopeClientException; -import org.apache.syncope.common.lib.patch.LongPatchItem; import org.apache.syncope.common.lib.patch.PasswordPatch; +import org.apache.syncope.common.lib.patch.StringPatchItem; import org.apache.syncope.common.lib.patch.UserPatch; import org.apache.syncope.common.lib.to.MembershipTO; import org.apache.syncope.common.lib.to.ProvisioningResult; @@ -76,17 +76,17 @@ public class UserWorkflowITCase extends AbstractITCase { assertNotNull(form.getTaskId()); assertNull(form.getOwner()); - // 3. claim task as rossini, with role 2 granting entitlement to claim forms but not in group 7, + // 3. claim task as rossini, with role "User manager" granting entitlement to claim forms but not in group 7, // designated for approval in workflow definition: fail UserTO rossini = userService.read(1L); - if (!rossini.getRoles().contains(2L)) { + if (!rossini.getRoles().contains("User manager")) { UserPatch userPatch = new UserPatch(); userPatch.setKey(1L); - userPatch.getRoles().add(new LongPatchItem.Builder(). - operation(PatchOperation.ADD_REPLACE).value(2L).build()); + userPatch.getRoles().add(new StringPatchItem.Builder(). + operation(PatchOperation.ADD_REPLACE).value("User manager").build()); rossini = updateUser(userPatch).getAny(); } - assertTrue(rossini.getRoles().contains(2L)); + assertTrue(rossini.getRoles().contains("User manager")); UserWorkflowService userService2 = clientFactory.create("rossini", ADMIN_PWD). getService(UserWorkflowService.class); @@ -97,7 +97,7 @@ public class UserWorkflowITCase extends AbstractITCase { assertEquals(ClientExceptionType.Workflow, e.getType()); } - // 4. claim task from bellini, with role 2 and in group 7 + // 4. claim task from bellini, with role "User manager" and in group 7 UserWorkflowService userService3 = clientFactory.create("bellini", ADMIN_PWD). getService(UserWorkflowService.class); form = userService3.claimForm(form.getTaskId()); http://git-wip-us.apache.org/repos/asf/syncope/blob/b738d3e9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java index 45b4762..f19f9dd 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java @@ -18,12 +18,14 @@ */ package org.apache.syncope.fit.core.reference; +import static org.apache.syncope.fit.core.reference.AbstractITCase.clientFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.security.AccessControlException; import java.util.List; import javax.ws.rs.core.Response; import org.apache.syncope.common.lib.SyncopeClientException; @@ -32,6 +34,8 @@ import org.apache.syncope.common.lib.to.VirSchemaTO; import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.EntityViolationType; import org.apache.syncope.common.lib.types.SchemaType; +import org.apache.syncope.common.rest.api.beans.SchemaQuery; +import org.apache.syncope.common.rest.api.service.SchemaService; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; @@ -41,7 +45,7 @@ public class VirSchemaITCase extends AbstractITCase { @Test public void list() { - List<VirSchemaTO> vSchemas = schemaService.list(SchemaType.VIRTUAL, null); + List<VirSchemaTO> vSchemas = schemaService.list(SchemaType.VIRTUAL, new SchemaQuery.Builder().build()); assertFalse(vSchemas.isEmpty()); for (VirSchemaTO vSchemaTO : vSchemas) { assertNotNull(vSchemaTO); @@ -88,6 +92,20 @@ public class VirSchemaITCase extends AbstractITCase { } @Test + public void anonymous() { + SchemaService unauthenticated = clientFactory.create().getService(SchemaService.class); + try { + unauthenticated.list(SchemaType.VIRTUAL, new SchemaQuery.Builder().build()); + fail(); + } catch (AccessControlException e) { + assertNotNull(e); + } + + SchemaService anonymous = clientFactory.create(ANONYMOUS_UNAME, ANONYMOUS_KEY).getService(SchemaService.class); + assertFalse(anonymous.list(SchemaType.VIRTUAL, new SchemaQuery.Builder().build()).isEmpty()); + } + + @Test public void issueSYNCOPE323() { VirSchemaTO actual = schemaService.read(SchemaType.VIRTUAL, "virtualdata"); assertNotNull(actual);
