From 42bf1a3ff8f219993d98e1939eb86bd428a62759 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Tue, 1 Oct 2024 14:57:08 -0700 Subject: [PATCH] Use WritablePropertyMap --- EHR_SM/src/org/labkey/ehr_sm/EHR_SMController.java | 3 ++- .../api/ehr/notification/AbstractEHRNotification.java | 3 ++- ehr/src/org/labkey/ehr/EHRManager.java | 3 ++- ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java | 6 +++--- ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java | 5 +++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/EHR_SM/src/org/labkey/ehr_sm/EHR_SMController.java b/EHR_SM/src/org/labkey/ehr_sm/EHR_SMController.java index a213cbda6..97325b310 100644 --- a/EHR_SM/src/org/labkey/ehr_sm/EHR_SMController.java +++ b/EHR_SM/src/org/labkey/ehr_sm/EHR_SMController.java @@ -20,6 +20,7 @@ import org.labkey.api.action.SimpleViewAction; import org.labkey.api.action.SpringActionController; import org.labkey.api.data.PropertyManager; +import org.labkey.api.data.PropertyManager.WritablePropertyMap; import org.labkey.api.exp.api.ExpSampleType; import org.labkey.api.exp.api.SampleTypeService; import org.labkey.api.security.RequiresPermission; @@ -124,7 +125,7 @@ public ModelAndView getView(AdminForm adminForm, boolean reshow, BindException e @Override public boolean handlePost(AdminForm adminForm, BindException errors) { - PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(getContainer(), EHR_SMManager.ANIMAL_SAMPLE_PROP_SET_NAME, true); + WritablePropertyMap props = PropertyManager.getWritableProperties(getContainer(), EHR_SMManager.ANIMAL_SAMPLE_PROP_SET_NAME, true); for (ExpSampleType animalSampleType : SampleTypeService.get().getSampleTypes(getContainer(), getUser(), true)) { if (Arrays.stream(adminForm.getSelectedAnimalSampleTypes()).anyMatch(s -> s.equals(animalSampleType.getName()))) diff --git a/ehr/api-src/org/labkey/api/ehr/notification/AbstractEHRNotification.java b/ehr/api-src/org/labkey/api/ehr/notification/AbstractEHRNotification.java index db61d8105..d04fcae23 100644 --- a/ehr/api-src/org/labkey/api/ehr/notification/AbstractEHRNotification.java +++ b/ehr/api-src/org/labkey/api/ehr/notification/AbstractEHRNotification.java @@ -19,6 +19,7 @@ import org.labkey.api.action.SpringActionController; import org.labkey.api.data.Container; import org.labkey.api.data.PropertyManager; +import org.labkey.api.data.PropertyManager.WritablePropertyMap; import org.labkey.api.ldk.notification.AbstractNotification; import org.labkey.api.module.Module; import org.labkey.api.module.ModuleLoader; @@ -109,7 +110,7 @@ protected Map getSavedValues(Container c) protected void saveValues(Container c, Map newValues) { - PropertyManager.PropertyMap map = PropertyManager.getWritableProperties(c, getClass().getName(), true); + WritablePropertyMap map = PropertyManager.getWritableProperties(c, getClass().getName(), true); Long lastSaveMills = map.containsKey(lastSave) ? Long.parseLong(map.get(lastSave)) : null; diff --git a/ehr/src/org/labkey/ehr/EHRManager.java b/ehr/src/org/labkey/ehr/EHRManager.java index 47f856b2a..10e1e5c1c 100644 --- a/ehr/src/org/labkey/ehr/EHRManager.java +++ b/ehr/src/org/labkey/ehr/EHRManager.java @@ -31,6 +31,7 @@ import org.labkey.api.data.DbSchema; import org.labkey.api.data.DbScope; import org.labkey.api.data.PropertyManager; +import org.labkey.api.data.PropertyManager.WritablePropertyMap; import org.labkey.api.data.PropertyStorageSpec; import org.labkey.api.data.RuntimeSQLException; import org.labkey.api.data.SQLFragment; @@ -1607,7 +1608,7 @@ public List validateDatasetCols(Container c, User u, File xml) throws IO public void lockAnimalCreation(Container c, User u, Boolean lock, Integer startingId, Integer idCount) { - PropertyManager.PropertyMap map = PropertyManager.getWritableProperties(c, LOCK_PROP_KEY, true); + WritablePropertyMap map = PropertyManager.getWritableProperties(c, LOCK_PROP_KEY, true); map.put("lockedBy", u.getDisplayName(u)); map.put("locked", lock.toString()); map.put("lockDate", new SimpleDateFormat(LookAndFeelProperties.getInstance(c).getDefaultDateTimeFormat()).format(new Date())); diff --git a/ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java b/ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java index 002615c68..ea72de8c2 100644 --- a/ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java +++ b/ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java @@ -15,13 +15,14 @@ */ package org.labkey.ehr.dataentry; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.collections.CaseInsensitiveHashMap; import org.labkey.api.data.CompareType; import org.labkey.api.data.Container; import org.labkey.api.data.ContainerManager; import org.labkey.api.data.PropertyManager; +import org.labkey.api.data.PropertyManager.WritablePropertyMap; import org.labkey.api.data.SimpleFilter; import org.labkey.api.data.TableInfo; import org.labkey.api.data.TableSelector; @@ -45,7 +46,6 @@ import org.quartz.JobBuilder; import org.quartz.JobDetail; import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.quartz.Trigger; import org.quartz.TriggerBuilder; import org.quartz.impl.StdSchedulerFactory; @@ -186,7 +186,7 @@ public static synchronized void schedule() public static void setProperties(Container c, Boolean isEnabled) { - PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(c, PROPERTY_DOMAIN, true); + WritablePropertyMap props = PropertyManager.getWritableProperties(c, PROPERTY_DOMAIN, true); props.put(ENABLED_PROP, isEnabled.toString()); props.save(); } diff --git a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java index 8404f92f4..be2b92634 100644 --- a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java +++ b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java @@ -22,6 +22,7 @@ import org.labkey.api.data.ContainerManager; import org.labkey.api.data.DbScope; import org.labkey.api.data.PropertyManager; +import org.labkey.api.data.PropertyManager.WritablePropertyMap; import org.labkey.api.data.SQLFragment; import org.labkey.api.data.SqlSelector; import org.labkey.api.data.TableInfo; @@ -175,7 +176,7 @@ public static Integer getHourOfDay() public static void setProperties(Boolean isEnabled, Container c, Integer hourOfDay, Boolean isKinshipValidation, Boolean allowImportDuringBusinessHours) { - PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(GENETICCALCULATIONS_PROPERTY_DOMAIN, true); + WritablePropertyMap props = PropertyManager.getWritableProperties(GENETICCALCULATIONS_PROPERTY_DOMAIN, true); props.put("enabled", isEnabled.toString()); props.put("container", c.getId()); props.put("hourOfDay", hourOfDay.toString()); @@ -194,7 +195,7 @@ public static void setProperties(Boolean isEnabled, Container c, Integer hourOfD public static void setLastRun(Container c, @NotNull Long lastRun) { - PropertyManager.PropertyMap pm = PropertyManager.getWritableProperties(c, GENETICCALCULATIONS_PROPERTY_DOMAIN, true); + WritablePropertyMap pm = PropertyManager.getWritableProperties(c, GENETICCALCULATIONS_PROPERTY_DOMAIN, true); pm.put("lastRun", lastRun.toString()); pm.save(); }