Several bugfixes

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

@@ -100,7 +100,7 @@ import javax.xml.bind.annotation.XmlTransient;
                             + " u.primaryEmailAddress"),
     @NamedQuery(name = "User.countByPrimaryEmailAddress",
                 query = "SELECT COUNT(u) FROM User u "
-                            + "WHERE u.primaryEmailAddress.address = :emailAddress"),
+                            + "WHERE u.primaryEmailAddress = :emailAddress"),
     @NamedQuery(
         name = "User.filterByNameAndEmail",
         query = "SELECT u FROM User u WHERE "

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

@@ -145,11 +145,10 @@ public class UserRepository extends AbstractEntityRepository<Long, User> {
      */
     public Optional<User> findByEmailAddress(final String emailAddress) {
         try {
-            return Optional.of(
+            return getSingleResult(
                 getEntityManager()
                     .createNamedQuery("User.findByEmailAddress", User.class)
                     .setParameter("emailAddress", emailAddress)
-                    .getSingleResult()
             );
         } catch (NoResultException ex) {
             return Optional.empty();

ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java

@@ -140,6 +140,9 @@ public class CategoryRepositoryTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java

@@ -131,6 +131,9 @@ public class ConfigurationManagerTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java

@@ -149,6 +149,9 @@ public class CcmObjectRepositoryTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java

@@ -246,6 +246,9 @@ public class GroupImportTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("imports", "imports")

ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java

@@ -250,6 +250,9 @@ public class GroupMembershipImportTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("imports", "imports")

ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java

@@ -245,6 +245,9 @@ public class UserImportTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("imports", "imports")

ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java

@@ -108,6 +108,9 @@ public class ConfigurationLoaderTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java

@@ -140,6 +140,9 @@ public class AuthorizationInterceptorTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java

@@ -143,6 +143,9 @@ public class ChallengeManagerTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java

@@ -133,6 +133,9 @@ public class GroupManagerTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java

@@ -133,6 +133,9 @@ public class GroupRepositoryTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java

@@ -137,6 +137,9 @@ public class OneTimeAuthManagerTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java

@@ -138,6 +138,9 @@ public class PartyRepositoryTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java

@@ -141,6 +141,9 @@ public class PermissionCheckerTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java

@@ -142,6 +142,9 @@ public class PermissionManagerTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java

@@ -130,6 +130,9 @@ public class RoleManagerTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java

@@ -141,6 +141,9 @@ public class RoleRepositoryTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java

@@ -157,6 +157,9 @@ public class SecuredCollectionTest {
             )
             .addClass(org.libreccm.imexport.Exportable.class)
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java

@@ -159,6 +159,9 @@ public class SecuredIteratorTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/ShiroTest.java

@@ -132,6 +132,9 @@ public class ShiroTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java

@@ -133,6 +133,9 @@ public class UserManagerTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java

@@ -138,6 +138,9 @@ public class UserRepositoryTest {
                 org.libreccm.testutils.dbunit.PgSqlJsonbType.class
             )
             .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class)
+            .addClass(
+                org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class
+            )
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

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

@@ -92,7 +92,7 @@ ccm_core.users:
     - party_id: 3100
       given_name: Jane
       family_name: Doe
-      primary_email_address: jane.doe@localhost
+      primary_email_address: jane.doe@example.org
       primary_email_address_bouncing: false
       primary_email_address_verified: true
       # foo123

ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml

@@ -22,36 +22,36 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      bouncing: false
-      email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address: john.doe@example.com
       family_name: Doe
       given_name: John
       party_id: 10
       # foo123
       password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Max Mustermann
     - banned: false
-      bouncing: false
-      email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address: max.mustermann@example.org
       family_name: Mustermann
       given_name: Max
       party_id: 20
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Joe Public
     - banned: false
-      bouncing: false
-      email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address: joe.public@example.com
       family_name: Public
       given_name: Joe
       party_id: 30
       password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
 ccm_core.groups:
     # Group 1
     - party_id: 100

ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml

@@ -22,36 +22,36 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      bouncing: false
-      email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address: john.doe@example.com
       family_name: Doe
       given_name: John
       party_id: 10
       # foo123
       password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Max Mustermann
     - banned: false
-      bouncing: false
-      email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address: max.mustermann@example.org
       family_name: Mustermann
       given_name: Max
       party_id: 20
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Joe Public
     - banned: false
-      bouncing: false
-      email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address: joe.public@example.com
       family_name: Public
       given_name: Joe
       party_id: 30
       password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
 ccm_core.groups:
     # Group 1
     - party_id: 100

ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml

@@ -18,43 +18,43 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      bouncing: false
-      email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address: john.doe@example.com
       family_name: Doe
       given_name: John
       party_id: 10
       # foo123
       password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Max Mustermann
     - banned: false
-      bouncing: false
-      email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address: max.mustermann@example.org
       family_name: Mustermann
       given_name: Max
       party_id: 20
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Joe Public
     - banned: false
-      bouncing: false
-      email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address: joe.public@example.com
       family_name: Public
       given_name: Joe
       party_id: 30
       password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Jane Doe
     - banned: false
-      bouncing: false
-      email_address: jane.doe@libreccm.example
+      primary_email_address_bouncing: false
+      primary_email_address: jane.doe@libreccm.example
       family_name: Doe
       given_name: Jane
       party_id: 40
       password: ofafodafa
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true

ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml

@@ -14,33 +14,33 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      bouncing: false
-      email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address: john.doe@example.com
       family_name: Doe
       given_name: John
       party_id: 10
       # foo123
       password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Max Mustermann
     - banned: false
-      bouncing: false
-      email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address: max.mustermann@example.org
       family_name: Mustermann
       given_name: Max
       party_id: 20
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true
     # Joe Public
     - banned: false
-      bouncing: false
-      email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address: joe.public@example.com
       family_name: Public
       given_name: Joe
       party_id: 30
       password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
       password_reset_required: false
-      verified: true
+      primary_email_address_verified: true

ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml

@@ -27,7 +27,7 @@ ccm_core.users:
     # John Doe
     - banned: false
       primary_email_address: john.doe@example.com
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Doe
       given_name: John
@@ -38,7 +38,7 @@ ccm_core.users:
     # Max Mustermann
     - banned: false
       primary_email_address: max.mustermann@example.org
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
@@ -49,7 +49,7 @@ ccm_core.users:
     # Joe Public
     - banned: false
       primary_email_address: joe.public@example.com
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Public
       given_name: Joe

ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml

@@ -27,7 +27,7 @@ ccm_core.users:
     # John Doe
     - banned: false
       primary_email_address: john.doe@example.com
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Doe
       given_name: John
@@ -38,7 +38,7 @@ ccm_core.users:
     # Max Mustermann
     - banned: false
       primary_email_address: max.mustermann@example.org
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
@@ -49,7 +49,7 @@ ccm_core.users:
     # Joe Public
     - banned: false
       primary_email_address: joe.public@example.com
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Public
       given_name: Joe

ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml

@@ -27,7 +27,7 @@ ccm_core.users:
     # John Doe
     - banned: false
       primary_email_address: john.doe@example.com
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Doe
       given_name: John
@@ -38,7 +38,7 @@ ccm_core.users:
     # Max Mustermann
     - banned: false
       primary_email_address: max.mustermann@example.org
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
@@ -49,7 +49,7 @@ ccm_core.users:
     # Joe Public
     - banned: false
       primary_email_address: joe.public@example.com
-      primary_email_address_bouning: false
+      primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Public
       given_name: Joe

ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml

@@ -16,7 +16,7 @@ ccm_core.users:
     - banned: false
       primary_email_address: john.doe@example.com
       primary_email_address_bouncing: false
-      primary_email_address_verfified: true
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10

ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml

@@ -14,7 +14,7 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: jd@example.com\"
+      primary_email_address: jd@example.com
       primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Doe

ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml

@@ -52,7 +52,7 @@ ccm_core.users:
       banned: false
       primary_email_address: jane.doe@example.org
       primary_email_address_bouncing: false
-      primary_email_address_verified: true
+      primary_email_address_verified: false
       family_name: Doe
       given_name: Jane
       password: $shiro1$SHA-512$500000$24lA090z7GKYr4VFlZ6t4A==$/heoTHPA5huT1UfJ8Q+waXEG6AjUKhFYLFrj7KW/l0/z9O+QkiZTtfPfbcPblgjcEvrROMEIoQY4Z65S7rFLQg==

ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml

@@ -36,7 +36,7 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: joe.public@example.com
+      primary_email_address: max.mustermann@example.org
       primary_email_address_bouncing: false
       primary_email_address_verified: true
       family_name: Public

ccm-core/src/test/resources/imports/org.libreccm.imexport.UserImportTest/org.libreccm.security.User/7cb9aba4-8071-4f27-af19-096e1473d050.json

@@ -4,11 +4,9 @@
     "name": "janedoe",
     "givenName": "Jane",
     "familyName": "Doe",
-    "primaryEmailAddress": {
-        "address": "jane.doe@libreccm.example",
-        "bouncing": false,
-        "verified": true
-    },
+    "primaryEmailAddress": "jane.doe@libreccm.example",
+    "primaryEmailAddressBouncing": false,
+    "primaryEmailAddressVerified": true,
     "banned": false,
     "password": "ofafodafa",
     "passwordResetRequired": false