Fix pgjsonb with audit and restore RoleITCase#create

apache · Feb 22, 2024 · 4376a9e · 4376a9e
1 parent af08e3e
commit 4376a9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...on/src/main/java/org/apache/syncope/core/persistence/jpa/PGJPAJSONPersistenceContext.java b/...on/src/main/java/org/apache/syncope/core/persistence/jpa/PGJPAJSONPersistenceContext.java
@@ -89,6 +89,7 @@ public AnySearchDAO anySearchDAO(
     }
 
     @ConditionalOnMissingBean(name = "pgJPAJSONAuditEntryDAO")
+    @Bean
     public AuditEntryDAO auditEntryDAO(final EntityManager entityManager) {
         return new PGJPAJSONAuditEntryDAO(entityManager);
     }

diff --git a/...c/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractProvidedKeyEntity.java b/...c/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractProvidedKeyEntity.java
@@ -20,6 +20,7 @@
 
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
+import jakarta.validation.constraints.NotNull;
 import org.apache.syncope.core.persistence.api.entity.ProvidedKeyEntity;
 
 @MappedSuperclass
@@ -28,6 +29,7 @@ public abstract class AbstractProvidedKeyEntity extends AbstractEntity implement
     private static final long serialVersionUID = 821537874069666593L;
 
     @Id
+    @NotNull
     private String id;
 
     @Override

diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RoleITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RoleITCase.java
@@ -77,7 +77,7 @@ public void create() {
             createRole(role);
             fail("This should not happen");
         } catch (SyncopeClientException e) {
-            assertEquals(ClientExceptionType.GenericPersistence, e.getType());
+            assertEquals(ClientExceptionType.InvalidRole, e.getType());
         }
 
         role.setKey("new" + getUUIDString());