From b2eca5232d45161c120d096dd8b82fd3e9a7f1c6 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 7 Nov 2022 20:07:06 +0100 Subject: [PATCH] Added missing annotations --- .../AbstractContentItemImExporter.java | 7 +++++-- .../main/java/org/libreccm/imexport/Processes.java | 12 ++++++++---- .../org/libreccm/security/PermissionImExporter.java | 1 - 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java b/ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java index 4d18bfb94..30826653a 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java @@ -21,14 +21,15 @@ package org.librecms.contentsection; import org.libreccm.categorization.CategorizationImExporter; import org.libreccm.categorization.Category; import org.libreccm.imexport.AbstractEntityImExporter; -import org.libreccm.imexport.Exportable; +import org.libreccm.imexport.Processes; +import org.libreccm.security.Permission; import org.libreccm.security.PermissionImExporter; -import java.util.HashSet; import java.util.Objects; import java.util.Set; import javax.annotation.PostConstruct; +import javax.enterprise.inject.Any; import javax.inject.Inject; import javax.transaction.Transactional; @@ -47,6 +48,8 @@ public abstract class AbstractContentItemImExporter private CategorizationImExporter categorizationImExporter; @Inject + @Any + @Processes(Permission.class) private PermissionImExporter permissionImExporter; @PostConstruct diff --git a/ccm-core/src/main/java/org/libreccm/imexport/Processes.java b/ccm-core/src/main/java/org/libreccm/imexport/Processes.java index 2b9aeab32..b77c02f21 100644 --- a/ccm-core/src/main/java/org/libreccm/imexport/Processes.java +++ b/ccm-core/src/main/java/org/libreccm/imexport/Processes.java @@ -33,10 +33,14 @@ import javax.inject.Qualifier; */ @Retention(RetentionPolicy.RUNTIME) @Qualifier -@Target({ElementType.TYPE, - ElementType.PARAMETER, - ElementType.FIELD, - ElementType.METHOD}) +@Target( + { + ElementType.TYPE, + ElementType.PARAMETER, + ElementType.FIELD, + ElementType.METHOD + } +) public @interface Processes { Class value(); diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java b/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java index 9cd5dd796..318873378 100644 --- a/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java +++ b/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java @@ -19,7 +19,6 @@ package org.libreccm.security; import org.libreccm.imexport.AbstractEntityImExporter; -import org.libreccm.imexport.Exportable; import org.libreccm.imexport.Processes; import java.util.Objects;