You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/06/12 09:43:23 UTC
[3/4] syncope git commit: [SYNCOPE-1106] Removed methods returning
Map, added methods for getting attribute for specific schema
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ec5f834/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
index abf2d5d..937c37b 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
@@ -93,7 +93,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
List<PropagationTaskTO> tasks = new ArrayList<>(
taskService.<PropagationTaskTO>list(new TaskQuery.Builder(TaskType.PROPAGATION).
anyTypeKind(AnyTypeKind.USER).entityKey(userTO.getKey()).build()).
- getResult());
+ getResult());
assertFalse(tasks.isEmpty());
BulkAction bulkAction = new BulkAction();
@@ -135,7 +135,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
// 1. create printer on external resource
AnyObjectTO anyObjectTO = AnyObjectITCase.getSampleTO("propagationJEXLTransformer");
- String originalLocation = anyObjectTO.getPlainAttrMap().get("location").getValues().get(0);
+ String originalLocation = anyObjectTO.getPlainAttr("location").getValues().get(0);
assertFalse(originalLocation.endsWith(suffix));
anyObjectTO = createAnyObject(anyObjectTO).getEntity();
@@ -145,8 +145,8 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
// (location ends with given suffix on external resource)
ConnObjectTO connObjectTO = resourceService.
readConnObject(RESOURCE_NAME_DBSCRIPTED, anyObjectTO.getType(), anyObjectTO.getKey());
- assertFalse(anyObjectTO.getPlainAttrMap().get("location").getValues().get(0).endsWith(suffix));
- assertTrue(connObjectTO.getAttrMap().get("LOCATION").getValues().get(0).endsWith(suffix));
+ assertFalse(anyObjectTO.getPlainAttr("location").getValues().get(0).endsWith(suffix));
+ assertTrue(connObjectTO.getAttr("LOCATION").getValues().get(0).endsWith(suffix));
} finally {
resourceService.update(originalResource);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ec5f834/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index 8458767..0869613 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -231,9 +231,9 @@ public class PullTaskITCase extends AbstractTaskITCase {
assertEquals(userName, userTO.getUsername());
assertEquals(ActivitiDetector.isActivitiEnabledForUsers(syncopeService)
? "active" : "created", userTO.getStatus());
- assertEquals("test9@syncope.apache.org", userTO.getPlainAttrMap().get("email").getValues().get(0));
- assertEquals("test9@syncope.apache.org", userTO.getPlainAttrMap().get("userId").getValues().get(0));
- assertTrue(Integer.valueOf(userTO.getPlainAttrMap().get("fullname").getValues().get(0)) <= 10);
+ assertEquals("test9@syncope.apache.org", userTO.getPlainAttr("email").getValues().get(0));
+ assertEquals("test9@syncope.apache.org", userTO.getPlainAttr("userId").getValues().get(0));
+ assertTrue(Integer.valueOf(userTO.getPlainAttr("fullname").getValues().get(0)) <= 10);
assertTrue(userTO.getResources().contains(RESOURCE_NAME_TESTDB));
assertTrue(userTO.getResources().contains(RESOURCE_NAME_WS2));
@@ -243,7 +243,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
// check for user template
userTO = userService.read("test7");
assertNotNull(userTO);
- assertEquals("TYPE_OTHER", userTO.getPlainAttrMap().get("ctype").getValues().get(0));
+ assertEquals("TYPE_OTHER", userTO.getPlainAttr("ctype").getValues().get(0));
assertEquals(3, userTO.getResources().size());
assertTrue(userTO.getResources().contains(RESOURCE_NAME_TESTDB));
assertTrue(userTO.getResources().contains(RESOURCE_NAME_WS2));
@@ -262,7 +262,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
userTO = userService.read("test8");
assertNotNull(userTO);
- assertEquals("TYPE_8", userTO.getPlainAttrMap().get("ctype").getValues().get(0));
+ assertEquals("TYPE_8", userTO.getPlainAttr("ctype").getValues().get(0));
// Check for ignored user - SYNCOPE-663
try {
@@ -315,7 +315,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
userTO = userService.read("testuser1");
assertNotNull(userTO);
- assertEquals("reconciled@syncope.apache.org", userTO.getPlainAttrMap().get("userId").getValues().get(0));
+ assertEquals("reconciled@syncope.apache.org", userTO.getPlainAttr("userId").getValues().get(0));
assertEquals("suspended", userTO.getStatus());
// enable user on external resource
@@ -408,16 +408,16 @@ public class PullTaskITCase extends AbstractTaskITCase {
// Check for SYNCOPE-436
assertEquals("pullFromLDAP",
- matchingUsers.getResult().get(0).getVirAttrMap().get("virtualReadOnly").getValues().get(0));
+ matchingUsers.getResult().get(0).getVirAttr("virtualReadOnly").getValues().get(0));
// Check for SYNCOPE-270
- assertNotNull(matchingUsers.getResult().get(0).getPlainAttrMap().get("obscure"));
+ assertNotNull(matchingUsers.getResult().get(0).getPlainAttr("obscure"));
// Check for SYNCOPE-123
- assertNotNull(matchingUsers.getResult().get(0).getPlainAttrMap().get("photo"));
+ assertNotNull(matchingUsers.getResult().get(0).getPlainAttr("photo"));
GroupTO groupTO = matchingGroups.getResult().iterator().next();
assertNotNull(groupTO);
assertEquals("testLDAPGroup", groupTO.getName());
- assertEquals("true", groupTO.getPlainAttrMap().get("show").getValues().get(0));
+ assertEquals("true", groupTO.getPlainAttr("show").getValues().get(0));
assertEquals(matchingUsers.getResult().iterator().next().getKey(), groupTO.getUserOwner());
assertNull(groupTO.getGroupOwner());
@@ -480,7 +480,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
// 1. create printer on external resource
AnyObjectTO anyObjectTO = AnyObjectITCase.getSampleTO("pull");
- String originalLocation = anyObjectTO.getPlainAttrMap().get("location").getValues().get(0);
+ String originalLocation = anyObjectTO.getPlainAttr("location").getValues().get(0);
assertFalse(originalLocation.startsWith(PrefixMappingItemTransformer.PREFIX));
anyObjectTO = createAnyObject(anyObjectTO).getEntity();
@@ -490,9 +490,9 @@ public class PullTaskITCase extends AbstractTaskITCase {
// (location starts with given prefix on external resource)
ConnObjectTO connObjectTO = resourceService.
readConnObject(RESOURCE_NAME_DBSCRIPTED, anyObjectTO.getType(), anyObjectTO.getKey());
- assertFalse(anyObjectTO.getPlainAttrMap().get("location").getValues().get(0).
+ assertFalse(anyObjectTO.getPlainAttr("location").getValues().get(0).
startsWith(PrefixMappingItemTransformer.PREFIX));
- assertTrue(connObjectTO.getAttrMap().get("LOCATION").getValues().get(0).
+ assertTrue(connObjectTO.getAttr("LOCATION").getValues().get(0).
startsWith(PrefixMappingItemTransformer.PREFIX));
// 3. unlink any existing printer and delete from Syncope (printer is now only on external resource)
@@ -761,7 +761,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
userTO = userService.read("testuser2");
assertNotNull(userTO);
- assertEquals("testuser2@syncope.apache.org", userTO.getPlainAttrMap().get("userId").getValues().get(0));
+ assertEquals("testuser2@syncope.apache.org", userTO.getPlainAttr("userId").getValues().get(0));
assertEquals(2, userTO.getMemberships().size());
assertEquals(4, userTO.getResources().size());
} finally {
@@ -784,7 +784,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
// 3. read e-mail address for user created by the PullTask first execution
UserTO userTO = userService.read("issuesyncope230");
assertNotNull(userTO);
- String email = userTO.getPlainAttrMap().get("email").getValues().iterator().next();
+ String email = userTO.getPlainAttr("email").getValues().iterator().next();
assertNotNull(email);
// 4. update TESTPULL on external H2 by changing e-mail address
@@ -796,7 +796,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
// 6. verify that the e-mail was updated
userTO = userService.read("issuesyncope230");
assertNotNull(userTO);
- email = userTO.getPlainAttrMap().get("email").getValues().iterator().next();
+ email = userTO.getPlainAttr("email").getValues().iterator().next();
assertNotNull(email);
assertEquals("updatedSYNCOPE230@syncope.apache.org", email);
}
@@ -876,7 +876,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
userTO = userService.read(userTO.getKey());
assertNotNull(userTO);
- assertNotNull(userTO.getPlainAttrMap().get("firstname").getValues().get(0));
+ assertNotNull(userTO.getPlainAttr("firstname").getValues().get(0));
} finally {
removeTestUsers();
}
@@ -886,8 +886,8 @@ public class PullTaskITCase extends AbstractTaskITCase {
public void issueSYNCOPE307() {
UserTO userTO = UserITCase.getUniqueSampleTO("s307@apache.org");
userTO.setUsername("test0");
- userTO.getPlainAttrMap().get("firstname").getValues().clear();
- userTO.getPlainAttrMap().get("firstname").getValues().add("nome0");
+ userTO.getPlainAttr("firstname").getValues().clear();
+ userTO.getPlainAttr("firstname").getValues().add("nome0");
userTO.getAuxClasses().add("csv");
AttrTO csvuserid = new AttrTO();
@@ -901,7 +901,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
assertNotNull(userTO);
userTO = userService.read(userTO.getKey());
- assertTrue(userTO.getVirAttrMap().isEmpty());
+ assertTrue(userTO.getVirAttrs().isEmpty());
// Update pull task
PullTaskTO task = taskService.read("38abbf9e-a1a3-40a1-a15f-7d0ac02f47f1", true);
@@ -921,7 +921,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
// check that template was successfully applied...
userTO = userService.read(userTO.getKey());
- assertEquals("virtualvalue", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virtualvalue", userTO.getVirAttr("virtualdata").getValues().get(0));
// ...and that propagation to db succeeded
JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource);
@@ -1018,9 +1018,9 @@ public class PullTaskITCase extends AbstractTaskITCase {
ConnObjectTO connObject =
resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), user.getKey());
assertNotNull(getLdapRemoteObject(
- connObject.getAttrMap().get(Name.NAME).getValues().get(0),
+ connObject.getAttr(Name.NAME).getValues().get(0),
oldCleanPassword,
- connObject.getAttrMap().get(Name.NAME).getValues().get(0)));
+ connObject.getAttr(Name.NAME).getValues().get(0)));
// 5. Update the LDAP Connector to retrieve passwords
ResourceTO ldapResource = resourceService.read(RESOURCE_NAME_LDAP);
@@ -1112,7 +1112,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
// the user is successfully pulled...
user = userService.read("pullFromLDAP");
assertNotNull(user);
- assertEquals("pullFromLDAP@syncope.apache.org", user.getPlainAttrMap().get("email").getValues().get(0));
+ assertEquals("pullFromLDAP@syncope.apache.org", user.getPlainAttr("email").getValues().get(0));
group = groupService.read("testLDAPGroup");
assertNotNull(group);
@@ -1120,18 +1120,18 @@ public class PullTaskITCase extends AbstractTaskITCase {
ConnObjectTO connObject =
resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), user.getKey());
assertNotNull(connObject);
- assertEquals("pullFromLDAP@syncope.apache.org", connObject.getAttrMap().get("mail").getValues().get(0));
- AttrTO userDn = connObject.getAttrMap().get(Name.NAME);
+ assertEquals("pullFromLDAP@syncope.apache.org", connObject.getAttr("mail").getValues().get(0));
+ AttrTO userDn = connObject.getAttr(Name.NAME);
assertNotNull(userDn);
assertEquals(1, userDn.getValues().size());
assertNotNull(
getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, userDn.getValues().get(0)));
// ...and propagated
- JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource);
- String email = queryForObject(
- jdbcTemplate, 50, "SELECT EMAIL FROM TESTPULL WHERE USERNAME=?", String.class, user.getUsername());
- assertEquals(user.getPlainAttrMap().get("email").getValues().get(0), email);
+ PagedResult<AbstractTaskTO> propagationTasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ resource(RESOURCE_NAME_DBPULL).
+ anyTypeKind(AnyTypeKind.USER).entityKey(user.getKey()).build());
+ assertEquals(1, propagationTasks.getSize());
// 4. update the user on the external resource
updateLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD,
@@ -1139,7 +1139,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
connObject = resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), user.getKey());
assertNotNull(connObject);
- assertEquals("pullFromLDAP2@syncope.apache.org", connObject.getAttrMap().get("mail").getValues().get(0));
+ assertEquals("pullFromLDAP2@syncope.apache.org", connObject.getAttr("mail").getValues().get(0));
// 5. exec the pull task again
execution = execProvisioningTask(taskService, pullTask.getKey(), 50, false);
@@ -1148,12 +1148,13 @@ public class PullTaskITCase extends AbstractTaskITCase {
// the internal is updated...
user = userService.read("pullFromLDAP");
assertNotNull(user);
- assertEquals("pullFromLDAP2@syncope.apache.org", user.getPlainAttrMap().get("email").getValues().get(0));
+ assertEquals("pullFromLDAP2@syncope.apache.org", user.getPlainAttr("email").getValues().get(0));
// ...and propagated
- email = queryForObject(
- jdbcTemplate, 50, "SELECT EMAIL FROM TESTPULL WHERE USERNAME=?", String.class, user.getUsername());
- assertEquals(user.getPlainAttrMap().get("email").getValues().get(0), email);
+ propagationTasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ resource(RESOURCE_NAME_DBPULL).
+ anyTypeKind(AnyTypeKind.USER).entityKey(user.getKey()).build());
+ assertEquals(2, propagationTasks.getSize());
} catch (Exception e) {
LOG.error("Unexpected during issueSYNCOPE1062()", e);
fail(e.getMessage());
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ec5f834/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java
index 370cf52..ebfb113 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ResourceITCase.java
@@ -35,6 +35,7 @@ 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.console.commons.ConnIdSpecialName;
import org.apache.syncope.client.lib.AnonymousAuthenticationHandler;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.to.AnyObjectTO;
@@ -573,7 +574,7 @@ public class ResourceITCase extends AbstractITCase {
@Override
public String transform(final ConnObjectTO input) {
- return input.getAttrMap().get("__NAME__").getValues().get(0);
+ return input.getAttr(ConnIdSpecialName.NAME).getValues().get(0);
}
}, read);
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ec5f834/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
index 69dd12e..356d98a 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
@@ -93,7 +93,7 @@ public class UserITCase extends AbstractITCase {
private static final FastDateFormat DATE_FORMAT = DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT;
private boolean getBooleanAttribute(final ConnObjectTO connObjectTO, final String attrName) {
- return Boolean.parseBoolean(connObjectTO.getAttrMap().get(attrName).getValues().get(0));
+ return Boolean.parseBoolean(connObjectTO.getAttr(attrName).getValues().get(0));
}
public static UserTO getUniqueSampleTO(final String email) {
@@ -335,7 +335,7 @@ public class UserITCase extends AbstractITCase {
// 4. try (and fail) to create another user with same (unique) values
userTO = getSampleTO(userTO.getUsername());
- AttrTO userIdAttr = userTO.getPlainAttrMap().get("userId");
+ AttrTO userIdAttr = userTO.getPlainAttr("userId");
userIdAttr.getValues().clear();
userIdAttr.getValues().add("a.b@c.com");
@@ -351,7 +351,7 @@ public class UserITCase extends AbstractITCase {
public void createWithRequiredValueMissing() {
UserTO userTO = getUniqueSampleTO("a.b@c.it");
- AttrTO type = userTO.getPlainAttrMap().get("ctype");
+ AttrTO type = userTO.getPlainAttr("ctype");
userTO.getPlainAttrs().remove(type);
userTO.getMemberships().add(new MembershipTO.Builder().
@@ -367,7 +367,7 @@ public class UserITCase extends AbstractITCase {
userTO.getPlainAttrs().add(attrTO("ctype", "F"));
- AttrTO surname = userTO.getPlainAttrMap().get("surname");
+ AttrTO surname = userTO.getPlainAttr("surname");
userTO.getPlainAttrs().remove(surname);
// 2. create user without surname (mandatory when type == 'F')
@@ -512,8 +512,7 @@ public class UserITCase extends AbstractITCase {
userTO = updateUser(userPatch).getEntity();
assertNotNull(userTO);
- assertNotNull(userTO.getDerAttrMap());
- assertFalse(userTO.getPlainAttrMap().containsKey("ctype"));
+ assertNull(userTO.getPlainAttr("ctype"));
}
@Test(expected = SyncopeClientException.class)
@@ -585,10 +584,10 @@ public class UserITCase extends AbstractITCase {
assertEquals(1, userTO.getMemberships().size());
assertFalse(userTO.getDerAttrs().isEmpty());
- AttrTO userIdAttr = userTO.getPlainAttrMap().get("userId");
+ AttrTO userIdAttr = userTO.getPlainAttr("userId");
assertEquals(Collections.singletonList(newUserId), userIdAttr.getValues());
- AttrTO fullNameAttr = userTO.getPlainAttrMap().get("fullname");
+ AttrTO fullNameAttr = userTO.getPlainAttr("fullname");
assertEquals(Collections.singletonList(newFullName), fullNameAttr.getValues());
}
@@ -838,7 +837,7 @@ public class UserITCase extends AbstractITCase {
userTO = createUser(userTO).getEntity();
assertNotNull(userTO);
- AttrTO loginDate = userTO.getPlainAttrMap().get("loginDate");
+ AttrTO loginDate = userTO.getPlainAttr("loginDate");
assertNotNull(loginDate);
assertEquals(1, loginDate.getValues().size());
@@ -852,7 +851,7 @@ public class UserITCase extends AbstractITCase {
userTO = updateUser(userPatch).getEntity();
assertNotNull(userTO);
- loginDate = userTO.getPlainAttrMap().get("loginDate");
+ loginDate = userTO.getPlainAttr("loginDate");
assertNotNull(loginDate);
assertEquals(2, loginDate.getValues().size());
}
@@ -928,12 +927,12 @@ public class UserITCase extends AbstractITCase {
UserTO actual = createUser(userTO).getEntity();
assertNotNull(actual);
- assertNotNull(actual.getDerAttrMap().get("csvuserid"));
+ assertNotNull(actual.getDerAttr("csvuserid"));
ConnObjectTO connObjectTO =
resourceService.readConnObject(RESOURCE_NAME_CSV, AnyTypeKind.USER.name(), actual.getKey());
assertNotNull(connObjectTO);
- assertEquals("sx-dx", connObjectTO.getAttrMap().get("THEIRGROUP").getValues().get(0));
+ assertEquals("sx-dx", connObjectTO.getAttr("THEIRGROUP").getValues().get(0));
}
@Test
@@ -1013,7 +1012,7 @@ public class UserITCase extends AbstractITCase {
ConnObjectTO connObjectTO =
resourceService.readConnObject(RESOURCE_NAME_CSV, AnyTypeKind.USER.name(), userTO.getKey());
- assertNull(connObjectTO.getAttrMap().get("email"));
+ assertNull(connObjectTO.getAttr("email"));
}
@Test
@@ -1321,7 +1320,7 @@ public class UserITCase extends AbstractITCase {
assertEquals(1, result.getPropagationStatuses().size());
assertEquals(PropagationTaskExecStatus.SUCCESS, result.getPropagationStatuses().get(0).getStatus());
assertEquals("rest-target-resource", result.getPropagationStatuses().get(0).getResource());
- assertEquals("surname", userTO.getPlainAttrMap().get("surname").getValues().get(0));
+ assertEquals("surname", userTO.getPlainAttr("surname").getValues().get(0));
// verify user exists on the backend REST service
WebClient webClient = WebClient.create(
@@ -1341,7 +1340,7 @@ public class UserITCase extends AbstractITCase {
assertEquals(1, result.getPropagationStatuses().size());
assertEquals(PropagationTaskExecStatus.SUCCESS, result.getPropagationStatuses().get(0).getStatus());
assertEquals("rest-target-resource", result.getPropagationStatuses().get(0).getResource());
- assertEquals("surname2", result.getEntity().getPlainAttrMap().get("surname").getValues().get(0));
+ assertEquals("surname2", result.getEntity().getPlainAttr("surname").getValues().get(0));
// verify user still exists on the backend REST service
response = webClient.get();
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ec5f834/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
index df32cad..499b24c 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
@@ -409,7 +409,7 @@ public class UserIssuesITCase extends AbstractITCase {
ConnObjectTO connObjectTO =
resourceService.readConnObject(RESOURCE_NAME_DBVIRATTR, AnyTypeKind.USER.name(), userTO.getKey());
assertNotNull(connObjectTO);
- assertEquals("virtualvalue", connObjectTO.getAttrMap().get("USERNAME").getValues().get(0));
+ assertEquals("virtualvalue", connObjectTO.getAttr("USERNAME").getValues().get(0));
// ----------------------------------
userTO = userService.read(userTO.getKey());
@@ -467,7 +467,7 @@ public class UserIssuesITCase extends AbstractITCase {
ConnObjectTO userOnDb = resourceService.readConnObject(
RESOURCE_NAME_TESTDB, AnyTypeKind.USER.name(), userTO.getKey());
- final AttrTO pwdOnTestDbAttr = userOnDb.getAttrMap().get(OperationalAttributes.PASSWORD_NAME);
+ final AttrTO pwdOnTestDbAttr = userOnDb.getAttr(OperationalAttributes.PASSWORD_NAME);
assertNotNull(pwdOnTestDbAttr);
assertNotNull(pwdOnTestDbAttr.getValues());
assertFalse(pwdOnTestDbAttr.getValues().isEmpty());
@@ -475,7 +475,7 @@ public class UserIssuesITCase extends AbstractITCase {
ConnObjectTO userOnDb2 = resourceService.readConnObject(
RESOURCE_NAME_TESTDB2, AnyTypeKind.USER.name(), userTO.getKey());
- final AttrTO pwdOnTestDb2Attr = userOnDb2.getAttrMap().get(OperationalAttributes.PASSWORD_NAME);
+ final AttrTO pwdOnTestDb2Attr = userOnDb2.getAttr(OperationalAttributes.PASSWORD_NAME);
assertNotNull(pwdOnTestDb2Attr);
assertNotNull(pwdOnTestDb2Attr.getValues());
assertFalse(pwdOnTestDb2Attr.getValues().isEmpty());
@@ -500,7 +500,7 @@ public class UserIssuesITCase extends AbstractITCase {
// 3c. verify that password *has* changed on testdb
userOnDb = resourceService.readConnObject(RESOURCE_NAME_TESTDB, AnyTypeKind.USER.name(), userTO.getKey());
- final AttrTO pwdOnTestDbAttrAfter = userOnDb.getAttrMap().get(OperationalAttributes.PASSWORD_NAME);
+ final AttrTO pwdOnTestDbAttrAfter = userOnDb.getAttr(OperationalAttributes.PASSWORD_NAME);
assertNotNull(pwdOnTestDbAttrAfter);
assertNotNull(pwdOnTestDbAttrAfter.getValues());
assertFalse(pwdOnTestDbAttrAfter.getValues().isEmpty());
@@ -508,7 +508,7 @@ public class UserIssuesITCase extends AbstractITCase {
// 3d. verify that password hasn't changed on testdb2
userOnDb2 = resourceService.readConnObject(RESOURCE_NAME_TESTDB2, AnyTypeKind.USER.name(), userTO.getKey());
- final AttrTO pwdOnTestDb2AttrAfter = userOnDb2.getAttrMap().get(OperationalAttributes.PASSWORD_NAME);
+ final AttrTO pwdOnTestDb2AttrAfter = userOnDb2.getAttr(OperationalAttributes.PASSWORD_NAME);
assertNotNull(pwdOnTestDb2AttrAfter);
assertNotNull(pwdOnTestDb2AttrAfter.getValues());
assertFalse(pwdOnTestDb2AttrAfter.getValues().isEmpty());
@@ -607,7 +607,7 @@ public class UserIssuesITCase extends AbstractITCase {
userPatch.setKey(userKey);
userPatch.getPlainAttrs().add(attrAddReplacePatch("ctype", "a type"));
UserTO userTO = updateUser(userPatch).getEntity();
- assertEquals("a type", userTO.getPlainAttrMap().get("ctype").getValues().get(0));
+ assertEquals("a type", userTO.getPlainAttr("ctype").getValues().get(0));
}
}
@@ -643,7 +643,7 @@ public class UserIssuesITCase extends AbstractITCase {
ConnObjectTO connObj = resourceService.readConnObject(
RESOURCE_NAME_LDAP, AnyTypeKind.GROUP.name(), groupTO.getKey());
assertNotNull(connObj);
- assertTrue(connObj.getAttrMap().get("uniqueMember").getValues().
+ assertTrue(connObj.getAttr("uniqueMember").getValues().
contains("uid=" + userTO.getUsername() + ",ou=people,o=isp"));
// 4. remove membership
@@ -658,7 +658,7 @@ public class UserIssuesITCase extends AbstractITCase {
// 5. read group on resource, check that user DN was removed from uniqueMember
connObj = resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.GROUP.name(), groupTO.getKey());
assertNotNull(connObj);
- assertFalse(connObj.getAttrMap().get("uniqueMember").getValues().
+ assertFalse(connObj.getAttr("uniqueMember").getValues().
contains("uid=" + userTO.getUsername() + ",ou=people,o=isp"));
// 6. restore original resource-ldap group mapping
@@ -690,19 +690,19 @@ public class UserIssuesITCase extends AbstractITCase {
userTO = createUser(userTO).getEntity();
assertTrue(userTO.getResources().contains(RESOURCE_NAME_LDAP));
- assertNotNull(userTO.getPlainAttrMap().get("obscure"));
- assertNotNull(userTO.getPlainAttrMap().get("photo"));
+ assertNotNull(userTO.getPlainAttr("obscure"));
+ assertNotNull(userTO.getPlainAttr("photo"));
// 3. read user on resource
ConnObjectTO connObj = resourceService.readConnObject(
RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), userTO.getKey());
assertNotNull(connObj);
- AttrTO registeredAddress = connObj.getAttrMap().get("registeredAddress");
+ AttrTO registeredAddress = connObj.getAttr("registeredAddress");
assertNotNull(registeredAddress);
- assertEquals(userTO.getPlainAttrMap().get("obscure").getValues(), registeredAddress.getValues());
- AttrTO jpegPhoto = connObj.getAttrMap().get("jpegPhoto");
+ assertEquals(userTO.getPlainAttr("obscure").getValues(), registeredAddress.getValues());
+ AttrTO jpegPhoto = connObj.getAttr("jpegPhoto");
assertNotNull(jpegPhoto);
- assertEquals(userTO.getPlainAttrMap().get("photo").getValues(), jpegPhoto.getValues());
+ assertEquals(userTO.getPlainAttr("photo").getValues(), jpegPhoto.getValues());
// 4. remove group
groupService.delete(groupTO.getKey());
@@ -806,14 +806,14 @@ public class UserIssuesITCase extends AbstractITCase {
userTO.getPlainAttrs().add(attrTO("makeItDouble", "3"));
userTO = createUser(userTO).getEntity();
- assertEquals("6", userTO.getPlainAttrMap().get("makeItDouble").getValues().get(0));
+ assertEquals("6", userTO.getPlainAttr("makeItDouble").getValues().get(0));
UserPatch userPatch = new UserPatch();
userPatch.setKey(userTO.getKey());
userPatch.getPlainAttrs().add(attrAddReplacePatch("makeItDouble", "7"));
userTO = updateUser(userPatch).getEntity();
- assertEquals("14", userTO.getPlainAttrMap().get("makeItDouble").getValues().get(0));
+ assertEquals("14", userTO.getPlainAttr("makeItDouble").getValues().get(0));
}
@Test
@@ -867,9 +867,9 @@ public class UserIssuesITCase extends AbstractITCase {
// 3. try (and succeed) to perform simple LDAP binding with provided password ('password123')
assertNotNull(getLdapRemoteObject(
- connObject.getAttrMap().get(Name.NAME).getValues().get(0),
+ connObject.getAttr(Name.NAME).getValues().get(0),
"password123",
- connObject.getAttrMap().get(Name.NAME).getValues().get(0)));
+ connObject.getAttr(Name.NAME).getValues().get(0)));
// 4. update user without any password change request
UserPatch userPatch = new UserPatch();
@@ -881,9 +881,9 @@ public class UserIssuesITCase extends AbstractITCase {
// 5. try (and succeed again) to perform simple LDAP binding: password has not changed
assertNotNull(getLdapRemoteObject(
- connObject.getAttrMap().get(Name.NAME).getValues().get(0),
+ connObject.getAttr(Name.NAME).getValues().get(0),
"password123",
- connObject.getAttrMap().get(Name.NAME).getValues().get(0)));
+ connObject.getAttr(Name.NAME).getValues().get(0)));
}
@Test
@@ -901,7 +901,7 @@ public class UserIssuesITCase extends AbstractITCase {
resourceService.readConnObject(RESOURCE_NAME_WS1, AnyTypeKind.USER.name(), userTO.getKey());
assertNotNull(actual);
// check if mapping attribute with purpose NONE really hasn't been propagated
- assertNull(actual.getAttrMap().get("NAME"));
+ assertNull(actual.getAttr("NAME"));
// 2. update resource ws-target-resource-1
ResourceTO ws1 = resourceService.read(RESOURCE_NAME_WS1);
@@ -941,8 +941,8 @@ public class UserIssuesITCase extends AbstractITCase {
ConnObjectTO newUser =
resourceService.readConnObject(RESOURCE_NAME_WS1, AnyTypeKind.USER.name(), userTO.getKey());
- assertNotNull(newUser.getAttrMap().get("NAME"));
- assertEquals("firstnameNew", newUser.getAttrMap().get("NAME").getValues().get(0));
+ assertNotNull(newUser.getAttr("NAME"));
+ assertEquals("firstnameNew", newUser.getAttr("NAME").getValues().get(0));
// 4. restore resource ws-target-resource-1 mapping
ws1NewUMapping = newWs1.getProvision(AnyTypeKind.USER.name()).getMapping();
@@ -1031,9 +1031,9 @@ public class UserIssuesITCase extends AbstractITCase {
resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), user.getKey());
assertNotNull(getLdapRemoteObject(
- connObject.getAttrMap().get(Name.NAME).getValues().get(0),
+ connObject.getAttr(Name.NAME).getValues().get(0),
"security123",
- connObject.getAttrMap().get(Name.NAME).getValues().get(0)));
+ connObject.getAttr(Name.NAME).getValues().get(0)));
// 5. Remove LDAPPasswordPropagationActions
resourceTO = resourceService.read(RESOURCE_NAME_LDAP);
@@ -1076,8 +1076,7 @@ public class UserIssuesITCase extends AbstractITCase {
assertNotNull(connObjectTO);
// check if password has not changed
- assertEquals("password0", connObjectTO.getAttrMap().
- get(OperationalAttributes.PASSWORD_NAME).getValues().get(0));
+ assertEquals("password0", connObjectTO.getAttr(OperationalAttributes.PASSWORD_NAME).getValues().get(0));
assertNull(userTO.getPassword());
// 3. create user with not null password and propagate onto resource-csv, specify not to save password on
@@ -1098,8 +1097,7 @@ public class UserIssuesITCase extends AbstractITCase {
assertNotNull(connObjectTO);
// check if password has been propagated and that saved userTO's password is null
- assertEquals("passwordTESTNULL1", connObjectTO.getAttrMap().
- get(OperationalAttributes.PASSWORD_NAME).getValues().get(0));
+ assertEquals("passwordTESTNULL1", connObjectTO.getAttr(OperationalAttributes.PASSWORD_NAME).getValues().get(0));
assertNull(userTO.getPassword());
// 4. create user and propagate password on resource-csv and on Syncope local storage
@@ -1119,8 +1117,7 @@ public class UserIssuesITCase extends AbstractITCase {
assertNotNull(connObjectTO);
// check if password has been correctly propagated on Syncope and resource-csv as usual
- assertEquals("passwordTESTNULL1", connObjectTO.getAttrMap().
- get(OperationalAttributes.PASSWORD_NAME).getValues().get(0));
+ assertEquals("passwordTESTNULL1", connObjectTO.getAttr(OperationalAttributes.PASSWORD_NAME).getValues().get(0));
Pair<Map<String, Set<String>>, UserTO> self =
clientFactory.create(userTO.getUsername(), "passwordTESTNULL1").self();
assertNotNull(self);
@@ -1171,12 +1168,12 @@ public class UserIssuesITCase extends AbstractITCase {
UserTO actual = createUser(userTO).getEntity();
assertNotNull(actual);
- assertNotNull(actual.getDerAttrMap().get("csvuserid"));
+ assertNotNull(actual.getDerAttr("csvuserid"));
ConnObjectTO connObjectTO =
resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), actual.getKey());
assertNotNull(connObjectTO);
- assertEquals("postalAddress", connObjectTO.getAttrMap().get("postalAddress").getValues().get(0));
+ assertEquals("postalAddress", connObjectTO.getAttr("postalAddress").getValues().get(0));
UserPatch userPatch = new UserPatch();
userPatch.setKey(actual.getKey());
@@ -1186,7 +1183,7 @@ public class UserIssuesITCase extends AbstractITCase {
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), actual.getKey());
assertNotNull(connObjectTO);
- assertEquals("newPostalAddress", connObjectTO.getAttrMap().get("postalAddress").getValues().get(0));
+ assertEquals("newPostalAddress", connObjectTO.getAttr("postalAddress").getValues().get(0));
}
@Test
@@ -1333,7 +1330,7 @@ public class UserIssuesITCase extends AbstractITCase {
ConnObjectTO connObject =
resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), user.getKey());
assertNotNull(connObject);
- AttrTO userDn = connObject.getAttrMap().get(Name.NAME);
+ AttrTO userDn = connObject.getAttr(Name.NAME);
assertNotNull(userDn);
assertEquals(1, userDn.getValues().size());
assertNotNull(getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, userDn.getValues().get(0)));
@@ -1358,7 +1355,7 @@ public class UserIssuesITCase extends AbstractITCase {
// 2. create user matching the condition above
UserTO user = UserITCase.getUniqueSampleTO("syncope1099U@apache.org");
- user.getPlainAttrMap().get("firstname").getValues().set(0, "issueSYNCOPE1099");
+ user.getPlainAttr("firstname").getValues().set(0, "issueSYNCOPE1099");
ProvisioningResult<UserTO> created = createUser(user);
assertNotNull(created);
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ec5f834/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
index 7b633a5..5f8661b 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
@@ -156,7 +156,7 @@ public class UserSelfITCase extends AbstractITCase {
public void authenticateByPlainAttribute() {
UserTO rossini = userService.read("rossini");
assertNotNull(rossini);
- String userId = rossini.getPlainAttrMap().get("userId").getValues().get(0);
+ String userId = rossini.getPlainAttr("userId").getValues().get(0);
assertNotNull(userId);
Pair<Map<String, Set<String>>, UserTO> self = clientFactory.create(userId, ADMIN_PWD).self();
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ec5f834/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java
index 97ebbc0..e310181 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java
@@ -89,7 +89,7 @@ public class VirAttrITCase extends AbstractITCase {
// 2. check for virtual attribute value
userTO = userService.read(userTO.getKey());
assertNotNull(userTO);
- assertEquals("virtualvalue", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virtualvalue", userTO.getVirAttr("virtualdata").getValues().get(0));
UserPatch userPatch = new UserPatch();
userPatch.setKey(userTO.getKey());
@@ -102,7 +102,7 @@ public class VirAttrITCase extends AbstractITCase {
// 4. check for virtual attribute value
userTO = userService.read(userTO.getKey());
assertNotNull(userTO);
- assertEquals("virtualupdated", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virtualupdated", userTO.getVirAttr("virtualdata").getValues().get(0));
}
@Test
@@ -144,7 +144,7 @@ public class VirAttrITCase extends AbstractITCase {
ConnObjectTO connObjectTO =
resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
- assertEquals("virtualvalue", connObjectTO.getAttrMap().get("COMPANYNAME").getValues().get(0));
+ assertEquals("virtualvalue", connObjectTO.getAttr("COMPANYNAME").getValues().get(0));
// ----------------------------------
// ----------------------------------
@@ -162,7 +162,7 @@ public class VirAttrITCase extends AbstractITCase {
userTO = result.getEntity();
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
- assertEquals("virtualvalue2", connObjectTO.getAttrMap().get("COMPANYNAME").getValues().get(0));
+ assertEquals("virtualvalue2", connObjectTO.getAttr("COMPANYNAME").getValues().get(0));
// ----------------------------------
// ----------------------------------
@@ -176,7 +176,7 @@ public class VirAttrITCase extends AbstractITCase {
assertEquals("suspended", userTO.getStatus());
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
- assertEquals("virtualvalue2", connObjectTO.getAttrMap().get("COMPANYNAME").getValues().get(0));
+ assertEquals("virtualvalue2", connObjectTO.getAttr("COMPANYNAME").getValues().get(0));
statusPatch = new StatusPatch();
statusPatch.setKey(userTO.getKey());
@@ -186,7 +186,7 @@ public class VirAttrITCase extends AbstractITCase {
assertEquals("active", userTO.getStatus());
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
- assertEquals("virtualvalue2", connObjectTO.getAttrMap().get("COMPANYNAME").getValues().get(0));
+ assertEquals("virtualvalue2", connObjectTO.getAttr("COMPANYNAME").getValues().get(0));
// ----------------------------------
// ----------------------------------
@@ -204,11 +204,11 @@ public class VirAttrITCase extends AbstractITCase {
userTO = result.getEntity();
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
- assertEquals("Surname2", connObjectTO.getAttrMap().get("SURNAME").getValues().get(0));
+ assertEquals("Surname2", connObjectTO.getAttr("SURNAME").getValues().get(0));
// virtual attribute value did not change
- assertFalse(connObjectTO.getAttrMap().get("COMPANYNAME").getValues().isEmpty());
- assertEquals("virtualvalue2", connObjectTO.getAttrMap().get("COMPANYNAME").getValues().get(0));
+ assertFalse(connObjectTO.getAttr("COMPANYNAME").getValues().isEmpty());
+ assertEquals("virtualvalue2", connObjectTO.getAttr("COMPANYNAME").getValues().get(0));
// ----------------------------------
}
@@ -232,7 +232,7 @@ public class VirAttrITCase extends AbstractITCase {
// 2. check for virtual attribute value
actual = userService.read(actual.getKey());
- assertEquals("virattrcache", actual.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virattrcache", actual.getVirAttr("virtualdata").getValues().get(0));
// 3. update virtual attribute directly
JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource);
@@ -248,7 +248,7 @@ public class VirAttrITCase extends AbstractITCase {
// 4. check for cached attribute value
actual = userService.read(actual.getKey());
- assertEquals("virattrcache", actual.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virattrcache", actual.getVirAttr("virtualdata").getValues().get(0));
UserPatch userPatch = new UserPatch();
userPatch.setKey(actual.getKey());
@@ -261,7 +261,7 @@ public class VirAttrITCase extends AbstractITCase {
// 6. check for virtual attribute value
actual = userService.read(actual.getKey());
assertNotNull(actual);
- assertEquals("virtualupdated", actual.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virtualupdated", actual.getVirAttr("virtualdata").getValues().get(0));
}
@Test
@@ -376,7 +376,7 @@ public class VirAttrITCase extends AbstractITCase {
// 2. check for virtual attribute value
userTO = userService.read(userTO.getKey());
- assertEquals("virattrcache", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virattrcache", userTO.getVirAttr("virtualdata").getValues().get(0));
// ----------------------------------------
// 3. change connector URL so that we are sure that any provided value will come from virtual cache
@@ -411,7 +411,7 @@ public class VirAttrITCase extends AbstractITCase {
// ----------------------------------------
userTO = userService.read(userTO.getKey());
- assertEquals("virattrcache", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virattrcache", userTO.getVirAttr("virtualdata").getValues().get(0));
// ----------------------------------------
// 5. restore connector URL, values can be read again from external resource
@@ -428,7 +428,7 @@ public class VirAttrITCase extends AbstractITCase {
// cached value still in place...
userTO = userService.read(userTO.getKey());
- assertEquals("virattrcache", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virattrcache", userTO.getVirAttr("virtualdata").getValues().get(0));
// force cache update by adding a resource which has virtualdata mapped for propagation
UserPatch userPatch = new UserPatch();
@@ -439,7 +439,7 @@ public class VirAttrITCase extends AbstractITCase {
assertNotNull(userTO);
userTO = userService.read(userTO.getKey());
- assertEquals("virattrcache2", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertEquals("virattrcache2", userTO.getVirAttr("virtualdata").getValues().get(0));
}
@Test
@@ -451,7 +451,7 @@ public class VirAttrITCase extends AbstractITCase {
userTO.getVirAttrs().add(attrTO("virtualReadOnly", "readOnly"));
userTO = createUser(userTO).getEntity();
// finding no values because the virtual attribute is readonly
- assertTrue(userTO.getVirAttrMap().get("virtualReadOnly").getValues().isEmpty());
+ assertTrue(userTO.getVirAttr("virtualReadOnly").getValues().isEmpty());
}
@Test
@@ -564,9 +564,9 @@ public class VirAttrITCase extends AbstractITCase {
Map<String, Object> actuals = jdbcTemplate.queryForMap(
"SELECT id, surname, email FROM testpull WHERE id=?",
- new Object[] { userTO.getPlainAttrMap().get("fullname").getValues().get(0) });
+ new Object[] { userTO.getPlainAttr("fullname").getValues().get(0) });
- assertEquals(userTO.getPlainAttrMap().get("fullname").getValues().get(0), actuals.get("id").toString());
+ assertEquals(userTO.getPlainAttr("fullname").getValues().get(0), actuals.get("id").toString());
assertEquals("ml@group.it", actuals.get("email"));
// -------------------------------------------
} catch (Exception e) {
@@ -593,7 +593,7 @@ public class VirAttrITCase extends AbstractITCase {
userTO = createUser(userTO).getEntity();
- assertNotNull(userTO.getVirAttrMap().get("virtualReadOnly"));
+ assertNotNull(userTO.getVirAttr("virtualReadOnly"));
}
@Test
@@ -611,8 +611,8 @@ public class VirAttrITCase extends AbstractITCase {
userTO = createUser(userTO).getEntity();
- assertNotNull(userTO.getVirAttrMap().get("virtualdata"));
- assertEquals("syncope501@apache.org", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertNotNull(userTO.getVirAttr("virtualdata"));
+ assertEquals("syncope501@apache.org", userTO.getVirAttr("virtualdata").getValues().get(0));
// 2. update virtual attribute
UserPatch userPatch = new UserPatch();
@@ -624,8 +624,8 @@ public class VirAttrITCase extends AbstractITCase {
assertNotNull(userTO);
// 3. check that user virtual attribute has really been updated
- assertFalse(userTO.getVirAttrMap().get("virtualdata").getValues().isEmpty());
- assertEquals("syncope501_updated@apache.org", userTO.getVirAttrMap().get("virtualdata").getValues().get(0));
+ assertFalse(userTO.getVirAttr("virtualdata").getValues().isEmpty());
+ assertEquals("syncope501_updated@apache.org", userTO.getVirAttr("virtualdata").getValues().get(0));
}
@Test