Fixed missing JSONIdentityInfo for AttachmentList

ccm-cms/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2023-02-23T193303",
+    "version": "7.0.0-SNAPSHOT.2023-02-26T075448",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@librecms/ccm-cms",
-            "version": "7.0.0-SNAPSHOT.2023-02-23T193303",
+            "version": "7.0.0-SNAPSHOT.2023-02-26T075448",
             "license": "LGPL-3.0-or-later",
             "dependencies": {
                 "@tiptap/core": "^2.0.0-beta.127",

ccm-cms/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@librecms/ccm-cms",
-    "version": "7.0.0-SNAPSHOT.2023-02-23T193303",
+    "version": "7.0.0-SNAPSHOT.2023-02-26T075448",
     "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",

ccm-cms/src/main/java/org/librecms/contentsection/AttachmentList.java

@@ -18,7 +18,10 @@
  */
 package org.librecms.contentsection;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.ObjectIdGenerator;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import org.hibernate.envers.Audited;
 import org.libreccm.core.Identifiable;
 import org.libreccm.imexport.Exportable;
@@ -89,6 +92,12 @@ import static org.librecms.CmsConstants.DB_SCHEMA;
                     + "AND l.item = :item "
                     + "ORDER BY l.listOrder")
 })
+@JsonIdentityInfo(
+    generator = ObjectIdGenerators.PropertyGenerator.class,
+    resolver = AttachmentListIdResolver.class,
+    property = "uuid",
+    scope = AttachmentList.class
+)
 public class AttachmentList implements Comparable<AttachmentList>,
                                        Identifiable,
                                        Exportable,

ccm-cms/src/main/java/org/librecms/contentsection/AttachmentListIdResolver.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2023 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.librecms.contentsection;
+
+import com.fasterxml.jackson.annotation.ObjectIdGenerator;
+import com.fasterxml.jackson.annotation.ObjectIdResolver;
+import org.libreccm.cdi.utils.CdiUtil;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class AttachmentListIdResolver
+    implements Serializable, ObjectIdResolver {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public void bindItem(
+        final ObjectIdGenerator.IdKey id,
+        final Object object
+    ) {
+        // According to the Jackson JavaDoc, this method can be used to keep
+        // track of objects directly in a resolver implementation. We don't need
+        // this here therefore this method is empty.
+    }
+
+    @Override
+    public Object resolveId(final ObjectIdGenerator.IdKey id) {
+        return CdiUtil
+            .createCdiUtil()
+            .findBean(AttachmentListRepository.class)
+            .findByUuid(id.key.toString())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "No AttachmentList with UUID %s found in the database.",
+                        id.key.toString()
+                    )
+                )
+            );
+    }
+
+    @Override
+    public ObjectIdResolver newForDeserialization(final Object context) {
+        return new AttachmentListIdResolver();
+    }
+
+    @Override
+    public boolean canUseFor(final ObjectIdResolver resolverType) {
+        return resolverType instanceof AttachmentListIdResolver;
+    }
+
+}

ccm-cms/src/main/java/org/librecms/contentsection/ContentItemIdResolver.java

@@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.ObjectIdResolver;
 import org.libreccm.cdi.utils.CdiUtil;
 
 import java.io.Serializable;
-import java.util.Optional;
 
 /**
  *

ccm-cms/src/main/java/org/librecms/contentsection/ItemAttachment.java

@@ -18,6 +18,8 @@
  */
 package org.librecms.contentsection;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import org.hibernate.envers.Audited;
 import org.libreccm.core.Identifiable;
 import org.libreccm.imexport.Exportable;
@@ -97,6 +99,7 @@ public class ItemAttachment<T extends Asset>
      */
     @ManyToOne(cascade = {CascadeType.PERSIST})
     @JoinColumn(name = "ATTACHMENT_LIST_ID")
+    @JsonIdentityReference(alwaysAsId = true)
     private AttachmentList attachmentList;
 
     /**