add more settings to enum to pass validation #11639

- :BagItHandlerEnabled
- :BagValidatorJobPoolSize
- :BagValidatorJobWaitInterval
- :BagValidatorMaxErrors
- :CreateDataFilesMaxErrorsToDisplay
- :FileCategories
- :LDNAnnounceRequiredFields
- :LDNTarget

These settings were originally added (not to the enum)
in the following PRs:

- #8478
- #8775
- #8677

Author: pdurbin

doc/release-notes/11639-db-opts-idempotency.md

@@ -25,11 +25,19 @@ Note: Despite the validation of setting names and languages, the content of any
 The following database settings are were added to the official list within the code (to remain valid with the settings cleanup mentioned above):
 
 - :BagGeneratorThreads
+- :BagItHandlerEnabled
 - :BagItLocalPath
+- :BagValidatorJobPoolSize
+- :BagValidatorJobWaitInterval
+- :BagValidatorMaxErrors
 - :BuiltinUsersKey - formerly BuiltinUsers.KEY
+- :CreateDataFilesMaxErrorsToDisplay
 - :DRSArchiverConfig - a Harvard-specific setting
 - :DuraCloudContext
 - :DuraCloudHost
 - :DuraCloudPort
+- :FileCategories
 - :GoogleCloudBucket
 - :GoogleCloudProject
+- :LDNAnnounceRequiredFields
+- :LDNTarget

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

@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.FileCategories;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 
 import jakarta.ejb.EJB;
@@ -21,7 +22,7 @@
 @Stateless
 public class DataFileCategoryServiceBean {
 
-    public static final String FILE_CATEGORIES_KEY = ":FileCategories";
+    public static final String FILE_CATEGORIES_KEY = FileCategories.toString();
 
     @EJB
     private SettingsServiceBean settingsService;

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

@@ -1,5 +1,6 @@
 package edu.harvard.iq.dataverse;
 
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.CreateDataFilesMaxErrorsToDisplay;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.file.CreateDataFileResult;
 import org.apache.commons.text.StringEscapeUtils;
@@ -18,7 +19,7 @@
 @Stateless
 public class EditDataFilesPageHelper {
 
-    public static final String MAX_ERRORS_TO_DISPLAY_SETTING = ":CreateDataFilesMaxErrorsToDisplay";
+    public static final String MAX_ERRORS_TO_DISPLAY_SETTING = CreateDataFilesMaxErrorsToDisplay.toString();
     public static final Integer MAX_ERRORS_TO_DISPLAY = 5;
 
     @Inject

src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java

@@ -499,6 +499,13 @@ Whether Harvesting (OAI) service is enabled
          * :ArchiverSettings used by multiple archive commands.
          */
         BagGeneratorThreads,
+        /**
+         * Various BagIt settings.
+         */
+        BagValidatorJobPoolSize,
+        BagValidatorMaxErrors,
+        BagValidatorJobWaitInterval,
+        BagItHandlerEnabled,
         /**
          * A comma-separated list of roles for which new dataverses should inherit the
          * corresponding role assignments from the parent dataverse. Also affects
@@ -675,6 +682,8 @@ Whether Harvesting (OAI) service is enabled
          * LDN Inbox Allowed Hosts - a comma separated list of IP addresses allowed to submit messages to the inbox
          */
         LDNMessageHosts,
+        LDNAnnounceRequiredFields,
+        LDNTarget,
 
         /*
          * Allow a custom JavaScript to control values of specific fields.
@@ -731,6 +740,8 @@ Whether Harvesting (OAI) service is enabled
          * files *with* the variable names line up top. 
          */
         StoreIngestedTabularFilesWithVarHeaders,
+        FileCategories,
+        CreateDataFilesMaxErrorsToDisplay,
 
         ContactFeedbackMessageSizeLimit,
         //Experimental setting to allow connecting to a GET external search service expecting a GET request with query parameter mirroring the search API query parameters (without search_service) 

src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidator.java

@@ -1,5 +1,8 @@
 package edu.harvard.iq.dataverse.util.bagit;
 
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.BagValidatorJobPoolSize;
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.BagValidatorJobWaitInterval;
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.BagValidatorMaxErrors;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.bagit.BagValidation.FileValidationResult;
 import edu.harvard.iq.dataverse.util.bagit.ManifestReader.ManifestChecksum;
@@ -27,9 +30,9 @@ public class BagValidator {
     private static final Logger logger = Logger.getLogger(BagValidator.class.getCanonicalName());
 
     public static enum BagValidatorSettings {
-        JOB_POOL_SIZE(":BagValidatorJobPoolSize", 4),
-        MAX_ERRORS(":BagValidatorMaxErrors", 5),
-        JOB_WAIT_INTERVAL(":BagValidatorJobWaitInterval", 10);
+        JOB_POOL_SIZE(BagValidatorJobPoolSize.toString(), 4),
+        MAX_ERRORS(BagValidatorMaxErrors.toString(), 5),
+        JOB_WAIT_INTERVAL(BagValidatorJobWaitInterval.toString(), 10);
 
         private String settingsKey;
         private Integer defaultValue;

src/main/java/edu/harvard/iq/dataverse/util/file/BagItFileHandlerFactory.java

@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse.util.file;
 
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.BagItHandlerEnabled;
 import edu.harvard.iq.dataverse.util.bagit.BagValidator;
 import edu.harvard.iq.dataverse.util.bagit.BagValidator.BagValidatorSettings;
 import edu.harvard.iq.dataverse.util.bagit.ManifestReader;
@@ -25,7 +26,7 @@ public class BagItFileHandlerFactory implements Serializable {
 
     private static final Logger logger = Logger.getLogger(BagItFileHandlerFactory.class.getCanonicalName());
 
-    public static final String BAGIT_HANDLER_ENABLED_SETTING = ":BagItHandlerEnabled";
+    public static final String BAGIT_HANDLER_ENABLED_SETTING = BagItHandlerEnabled.toString();
 
     @EJB
     private SettingsServiceBean settingsService;

src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/LDNAnnounceDatasetVersionStep.java

@@ -5,6 +5,8 @@
 import edu.harvard.iq.dataverse.DatasetFieldType;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.LDNAnnounceRequiredFields;
+import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.LDNTarget;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.bagit.OREMap;
 import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
@@ -52,8 +54,8 @@
 
 public class LDNAnnounceDatasetVersionStep implements WorkflowStep {
     private static final Logger logger = Logger.getLogger(LDNAnnounceDatasetVersionStep.class.getName());
-    private static final String REQUIRED_FIELDS = ":LDNAnnounceRequiredFields";
-    private static final String LDN_TARGET = ":LDNTarget";
+    private static final String REQUIRED_FIELDS = LDNAnnounceRequiredFields.toString();
+    private static final String LDN_TARGET = LDNTarget.toString();
     private static final String RELATED_PUBLICATION = "publication";
 
     JsonLDTerm publicationIDType = null;