diff --git a/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java b/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java index 0c33084..966b876 100644 --- a/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java +++ b/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java @@ -242,7 +242,7 @@ public class AddOnDataJson implements DataAccessAddOn { } } data.covers.add(remoteKey); - DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName)); + DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName)); } public static void addLink(final Class clazz, final UUID uuid, final String column, final Long remoteKey) @@ -297,7 +297,7 @@ public class AddOnDataJson implements DataAccessAddOn { newList.add(elem); } data.covers = newList; - DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName)); + DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName)); } public static void removeLink(final Class clazz, final Long id, final String column, final Long remoteKey) diff --git a/src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongLong.java b/src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongLong.java index 45daf77..b4b3485 100644 --- a/src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongLong.java +++ b/src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongLong.java @@ -3,11 +3,10 @@ package org.kar.archidata.dataAccess.addOn.model; import java.util.List; import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.model.GenericDataSoftDelete; -import jakarta.persistence.Column; +import jakarta.persistence.Id; -public class TableCoversLongLong extends GenericDataSoftDelete { +public class TableCoversLongLong { public TableCoversLongLong() { // nothing to do... } @@ -17,8 +16,10 @@ public class TableCoversLongLong extends GenericDataSoftDelete { this.covers = covers; } + @Id + public Long id; + @DataJson() - @Column(nullable = false) public List covers; } diff --git a/src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDUUID.java b/src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDUUID.java index f18dd5a..ae3dc43 100644 --- a/src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDUUID.java +++ b/src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDUUID.java @@ -4,12 +4,10 @@ import java.util.List; import java.util.UUID; import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.model.GenericDataSoftDelete; -import jakarta.persistence.Column; import jakarta.persistence.Id; -public class TableCoversUUIDUUID extends GenericDataSoftDelete { +public class TableCoversUUIDUUID { public TableCoversUUIDUUID() { // nothing to do... } @@ -19,11 +17,9 @@ public class TableCoversUUIDUUID extends GenericDataSoftDelete { this.covers = covers; } - @Column(nullable = false) @Id public UUID uuid; @DataJson() - @Column(nullable = false) public List covers; } diff --git a/src/org/kar/archidata/tools/DataTools.java b/src/org/kar/archidata/tools/DataTools.java index b42d88e..b20f182 100644 --- a/src/org/kar/archidata/tools/DataTools.java +++ b/src/org/kar/archidata/tools/DataTools.java @@ -224,7 +224,7 @@ public class DataTools { // public NodeSmall uploadFile(final FormDataMultiPart form) { LOGGER.info("Upload media file: {}", fileMetaData); LOGGER.info(" - id: {}", id); - LOGGER.info(" - file_name: ", fileMetaData.getFileName()); + LOGGER.info(" - file_name: {} ", fileMetaData.getFileName()); LOGGER.info(" - fileInputStream: {}", fileInputStream); LOGGER.info(" - fileMetaData: {}", fileMetaData); final CLASS_TYPE media = DataAccess.get(clazz, id);