Fixed test failures

ccm-core/src/main/java/org/libreccm/security/User.java

@@ -71,14 +71,17 @@ import javax.xml.bind.annotation.XmlTransient;
 @Entity
 @Table(name = "USERS", schema = DB_SCHEMA)
 @NamedQueries({
-    @NamedQuery(name = "User.findByUuid",
+    @NamedQuery(
-                query = "SELECT u FROM User u WHERE u.uuid = :uuid"),
+        name = "User.findByUuid",
-    @NamedQuery(name = "User.findByName",
+        query = "SELECT u FROM User u WHERE u.uuid = :uuid"
-                query = "SELECT u FROM User u WHERE u.name = :name "
+    ),
-                            + "ORDER BY u.name, "
+    @NamedQuery(
-                            + "         u.familyName, "
+        name = "User.findByName",
-                            + "         u.givenName, "
+        query = "SELECT u FROM User u WHERE u.name = :name "
-                            + "         u.primaryEmailAddress.address"),
+                    + "ORDER BY u.name, "
+                    + "         u.familyName, "
+                    + "         u.givenName"
+    ),
     @NamedQuery(name = "User.countByName",
                 query = "SELECT COUNT(u) FROM User u WHERE u.name = :name"),
 //    @NamedQuery(name = "User.findByEmailAddress",
@@ -96,12 +99,11 @@ import javax.xml.bind.annotation.XmlTransient;
         query = "SELECT u FROM User u WHERE "
                     + "LOWER(u.name) LIKE CONCAT(LOWER(:term), '%') "
                     + "OR LOWER(u.givenName) LIKE CONCAT(LOWER(:term), '%') "
-                    + "OR LOWER(u.familyName) LIKE CONCAT(LOWER(:term), '%') "
+                    + "OR LOWER(u.familyName) LIKE CONCAT(LOWER(:term), '%')"
-                    + "OR LOWER(u.primaryEmailAddress.address) LIKE CONCAT('%', LOWER(:term), '%') "
+                    + "ORDER BY u.name,"
-                + "ORDER BY u.name,"
                     + "u.familyName, "
-                    + "u.givenName, "
+                    + "u.givenName"
-                    + "u.primaryEmailAddress.address"),
+    ),
 //    @NamedQuery(
 //        name = "User.findAllOrderedByUsername",
 //        query = "SELECT u FROM User u ORDER BY u.name, "
@@ -349,7 +351,8 @@ public class User extends Party implements Serializable, Exportable {
 
     @Override
     public JsonObjectBuilder buildJson() {
-        final JsonArrayBuilder emailAddressesArrayBuilder = Json.createArrayBuilder();
+        final JsonArrayBuilder emailAddressesArrayBuilder = Json
+            .createArrayBuilder();
 
         emailAddresses
             .stream()
@@ -361,24 +364,24 @@ public class User extends Party implements Serializable, Exportable {
             .add("givenName", givenName)
             .add("familyName", familyName)
             .add("primaryEmailAddress", primaryEmailAddress.buildJson())
-        .add(
+            .add(
-            "emailAddresses", 
+                "emailAddresses",
-            emailAddresses
+                emailAddresses
-            .stream()
+                    .stream()
-            .map(EmailAddress::buildJson)
+                    .map(EmailAddress::buildJson)
-            .map(JsonObjectBuilder::build)
+                    .map(JsonObjectBuilder::build)
-            .collect(new JsonArrayCollector())
+                    .collect(new JsonArrayCollector())
-        )
+            )
-        .add("banned", banned)
+            .add("banned", banned)
-        .add("passwordResetRequired", passwordResetRequired)
+            .add("passwordResetRequired", passwordResetRequired)
-        .add(
+            .add(
-            "groupMemberships",
+                "groupMemberships",
-            groupMemberships
+                groupMemberships
-            .stream()
+                    .stream()
-            .map(GroupMembership::buildJson)
+                    .map(GroupMembership::buildJson)
-            .map(JsonObjectBuilder::build)
+                    .map(JsonObjectBuilder::build)
-            .collect(new JsonArrayCollector())
+                    .collect(new JsonArrayCollector())
-        );
+            );
     }
 
     @Override

ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml

@@ -84,30 +84,24 @@ ccm_core.users:
     - party_id: 3000
       given_name: public
       family_name: user
-      email_address: public-user@localhost
+      primary_email_address: "{\"address\": \"public-user@localhost\", \"bouncing\": false, \"verified\": true}"
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
     - party_id: 3100
       given_name: Jane
       family_name: Doe
-      email_address: jane.doe@example.org
+      primary_email_address: "{\"address\": \"jane.doe@localhost\", \"bouncing\": false, \"verified\": true}"
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
     - party_id: 3200
       given_name: Maria
       family_name: Muster
-      email_address: mmuster@example.com
+      primary_email_address: "{\"address\": \"mmuster@example.com\", \"bouncing\": false, \"verified\": true}"
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
 
 ccm_core.ccm_roles:

ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml

@@ -69,28 +69,22 @@ ccm_core.users:
     - party_id: 100
       given_name: public
       family_name: user
-      email_address: public-user@localhost
+      primary_email_address: "{\"address\": \"public-user@localhost\", \"bouncing\": false, \"verified\": true}"
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
     - party_id: 200
       given_name: John
       family_name: Doe
-      email_address: john.doe@example.org
+      primary_email_address: "{\"address\": \"john.doe@example.org\", \"bouncing\": false, \"verified\": true}"
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
     - party_id: 300
       given_name: Max
       family_name: Mustermann
-      email_address: max.mustermann@example.org
+      primary_email_address: "{\"address\": \"mmuster@example.org\", \"bouncing\": false, \"verified\": true}"
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
 
 ccm_core.ccm_roles:

ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/data.yml

@@ -59,28 +59,22 @@ ccm_core.users:
     - party_id: 100
       given_name: public
       family_name: user
-      email_address: public-user@localhost
+      primary_email_address: "{\"address\": \"public-user@localhost\", \"bouncing\": false, \"verified\": true}"
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
     - party_id: 200
       given_name: John
       family_name: Doe
-      email_address: john.doe@example.org
+      primary_email_address: "{\"address\": \"john.doe@example.org\", \"bouncing\": false, \"verified\": true}"
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
     - party_id: 300
       given_name: Max
       family_name: Mustermann
-      email_address: max.mustermann@example.org
+      primary_email_address: "{\"address\": \"mmuster@example.org\", \"bouncing\": false, \"verified\": true}"
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
-      bouncing: false
-      verified: true
       password_reset_required: false
 
 ccm_core.ccm_roles:

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-account-activation.xml

@@ -31,21 +31,17 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
-                    password_reset_required="false"
+                    password_reset_required="false" />
-                    verified="true"/>
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
-                    password_reset_required="false"
+                    password_reset_required="false" />
-                    verified="true"/>
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-email-verification.xml

@@ -31,21 +31,19 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
-                    password_reset_required="false"
+                    password_reset_required="false" />
-                    verified="true"/>
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-password-recovery.xml

@@ -31,21 +31,20 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-account-activation.xml

@@ -31,21 +31,20 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="false"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="false"/>
+    />
 
 </dataset>
 

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-email-verification.xml

@@ -31,21 +31,19 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                     primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="false"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
 
 </dataset>
 

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-password-recovery.xml

@@ -31,21 +31,20 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="false"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="true"
                     password_reset_required="false"
-                    verified="false"/>
+                    verified="false"
+    />
 </dataset>
 
 

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/data.xml

@@ -31,20 +31,16 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
-                    password_reset_required="false"
+                    password_reset_required="false" />
-                    verified="true"/>
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
-                    password_reset_required="false"
+                    password_reset_required="false" />
-                    verified="true"/>
     
 </dataset>

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-account-activation.xml

@@ -31,21 +31,19 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="false"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="true"
                     password_reset_required="false"
-                    verified="false"/>
+    />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-email-verification.xml

@@ -31,21 +31,19 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="false"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="false"/>
+    />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"

ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-password-recovery.xml

@@ -31,21 +31,19 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="false"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="true"
                     password_reset_required="false"
-                    verified="false"/>
+    />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"

ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-create.xml

@@ -31,21 +31,19 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
      
     <ccm_core.one_time_auth_tokens token_id="-100"
                                    user_id="-10"

ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-invalidate.xml

@@ -31,19 +31,17 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
 </dataset>

ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/data.xml

@@ -31,21 +31,19 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    email_address="john.doe@example.com"
+                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    email_address="max.muster@example.org"
+                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
-                    verified="true"/>
+    />
      
     <ccm_core.one_time_auth_tokens 
         token_id="-100"