move file count limit from dvObject to dvObjectContainer

Author: stevenwinship

src/main/java/edu/harvard/iq/dataverse/DvObject.java

@@ -140,9 +140,6 @@ public String visit(DataFile df) {
 
     @Column(insertable = false, updatable = false) private String dtype;
 
-    @Column( nullable = true )
-    private Integer datasetFileCountLimit;
-
     @OneToMany(mappedBy="dvobject",fetch = FetchType.LAZY,cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
     private List<DataverseFeaturedItem> dataverseFeaturedItems;
 
@@ -509,15 +506,6 @@ public StorageQuota getStorageQuota() {
     public void setStorageQuota(StorageQuota storageQuota) {
         this.storageQuota = storageQuota;
     }
-
-    public Integer getDatasetFileCountLimit() {
-        return datasetFileCountLimit;
-    }
-    public void setDatasetFileCountLimit(Integer datasetFileCountLimit) {
-        // Store as -1 if missing or invalid
-        this.datasetFileCountLimit = datasetFileCountLimit != null && datasetFileCountLimit <= 0 ? Integer.valueOf(-1) : datasetFileCountLimit;
-    }
-
     /**
      * 
      * @param other 

src/main/java/edu/harvard/iq/dataverse/DvObjectContainer.java

@@ -9,11 +9,9 @@
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonObjectBuilder;
-import jakarta.persistence.CascadeType;
+import jakarta.persistence.*;
+
 import java.util.Optional;
-import jakarta.persistence.MappedSuperclass;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Transient;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -56,6 +54,9 @@ public boolean isEffectivelyPermissionRoot() {
 
     @OneToOne(mappedBy = "dvObjectContainer",cascade={ CascadeType.REMOVE, CascadeType.PERSIST}, orphanRemoval=true)
     private StorageUse storageUse;
+
+    @Column( nullable = true )
+    private Integer datasetFileCountLimit;
 
     public String getEffectiveStorageDriverId() {
         String id = storageDriver;
@@ -260,6 +261,13 @@ public PidProvider getEffectivePidGenerator() {
         }
         return pidGenerator;
     }
+    public Integer getDatasetFileCountLimit() {
+        return datasetFileCountLimit;
+    }
+    public void setDatasetFileCountLimit(Integer datasetFileCountLimit) {
+        // Store as -1 if missing or invalid
+        this.datasetFileCountLimit = datasetFileCountLimit != null && datasetFileCountLimit <= 0 ? Integer.valueOf(-1) : datasetFileCountLimit;
+    }
 
     public Integer getEffectiveDatasetFileCountLimit() {
         if (isDatasetFileCountLimitNotSet(getDatasetFileCountLimit()) && getOwner() != null) {

src/main/resources/db/migration/V6.5.0.14.sql

@@ -1 +1,2 @@
-ALTER TABLE DVOBJECT ADD COLUMN IF NOT EXISTS datasetfilecountlimit bigint;
+ALTER TABLE DATASET ADD COLUMN IF NOT EXISTS datasetfilecountlimit bigint;
+ALTER TABLE DATAVERSE ADD COLUMN IF NOT EXISTS datasetfilecountlimit bigint;