Skip to content

Use WritablePropertyMap #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Oct 2, 2024
Merged

Use WritablePropertyMap #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion EHR_SM/src/org/labkey/ehr_sm/EHR_SMController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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())))
Expand Down
3 changes: 2 additions & 1 deletion ehr/api-src/org/labkey/api/ehr/notification/AbstractEHRNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -109,7 +110,7 @@ protected Map<String, String> getSavedValues(Container c)

protected void saveValues(Container c, Map<String, String> 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;

Expand Down
3 changes: 2 additions & 1 deletion ehr/src/org/labkey/ehr/EHRManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1607,7 +1608,7 @@ public List<String> 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()));
Expand Down
6 changes: 3 additions & 3 deletions ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down
5 changes: 3 additions & 2 deletions ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand All @@ -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();
}
Expand Down