From 2333bbc35e743dea6a6dd1c3e60edea23e7e08d8 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Sat, 22 Oct 2022 19:30:43 +0200
Subject: [PATCH] Some fixes related to imports

---
 ccm-cms/package-lock.json                              |  4 ++--
 ccm-cms/package.json                                   |  2 +-
 .../java/org/librecms/contentsection/ContentItem.java  |  2 ++
 .../src/main/java/org/libreccm/core/CcmObject.java     |  4 +++-
 .../org/libreccm/security/PermissionImExporter.java    | 10 +++++-----
 .../src/main/java/org/libreccm/workflow/Workflow.java  |  2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json
index 20c11931d..9616cd857 100644
--- a/ccm-cms/package-lock.json
+++ b/ccm-cms/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2022-10-15T153227",
+    "version": "7.0.0-SNAPSHOT.2022-10-22T172914",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@librecms/ccm-cms",
-            "version": "7.0.0-SNAPSHOT.2022-10-15T153227",
+            "version": "7.0.0-SNAPSHOT.2022-10-22T172914",
             "license": "LGPL-3.0-or-later",
             "dependencies": {
                 "@tiptap/core": "^2.0.0-beta.127",
diff --git a/ccm-cms/package.json b/ccm-cms/package.json
index 774452df0..07e77017b 100644
--- a/ccm-cms/package.json
+++ b/ccm-cms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2022-10-15T153227",
+    "version": "7.0.0-SNAPSHOT.2022-10-22T172914",
     "description": "JavaScript stuff for ccm-cms",
     "main": "target/generated-resources/assets/@content-sections/cms-admin.js",
     "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts",
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
index e9e4d6de9..d8fce0271 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
@@ -18,6 +18,7 @@
  */
 package org.librecms.contentsection;
 
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import static org.librecms.CmsConstants.*;
@@ -685,6 +686,7 @@ public class ContentItem extends CcmObject implements Serializable, Exportable {
     @JoinColumn(name = "WORKFLOW_ID")
     @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
     @XmlElement(name = "workflow", namespace = CMS_XML_NS)
+    @JsonIdentityReference(alwaysAsId = true)
     private Workflow workflow;
 
     /**
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
index 76c81e540..b09c69642 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
@@ -43,6 +43,8 @@ import java.util.Objects;
 import static org.libreccm.core.CoreConstants.CORE_XML_NS;
 import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
+import org.libreccm.imexport.Exportable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -91,7 +93,7 @@ import javax.persistence.Table;
 @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
                   resolver = CcmObjectIdResolver.class,
                   property = "uuid")
-public class CcmObject implements Identifiable, Serializable {
+public class CcmObject implements Exportable, Identifiable, Serializable {
 
     private static final long serialVersionUID = 201504261329L;
 
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 fdf832a8f..28d856115 100644
--- a/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java
@@ -18,11 +18,11 @@
  */
 package org.libreccm.security;
 
+import org.libreccm.core.CcmObject;
 import org.libreccm.imexport.AbstractEntityImExporter;
 import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
-import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
@@ -53,10 +53,10 @@ public class PermissionImExporter extends AbstractEntityImExporter<Permission> {
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        final Set<Class<? extends Exportable>> classes = new HashSet<>();
-        classes.add(Role.class);
-
-        return classes;
+        return Set.of(
+            CcmObject.class,
+            Role.class
+        );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java
index 97a732125..02f015a33 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java
@@ -165,7 +165,7 @@ public class Workflow implements Identifiable, Serializable, Exportable {
      */
     @OneToOne
     @JoinColumn(name = "OBJECT_ID")
-    @JsonIdentityReference(alwaysAsId = true)
+    @JsonIgnore
     private CcmObject object;
 
     /**