Skip to content

Commit 8ee0ccc

Browse files
labkey-matthewblabkey-matthewb
committed
Merge remote-tracking branch 'origin/develop' into fb_filesystemlike
2 parents c150474 + 2bccf94 commit 8ee0ccc

File tree

7 files changed

+29
-22
lines changed

7 files changed

+29
-22
lines changed

‎LDK/src/org/labkey/ldk/LDKController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.labkey.api.data.CoreSchema;
4040
import org.labkey.api.data.DbSequenceManager;
4141
import org.labkey.api.data.PropertyManager;
42+
import org.labkey.api.data.PropertyManager.WritablePropertyMap;
4243
import org.labkey.api.data.SqlExecutor;
4344
import org.labkey.api.data.SqlScriptRunner;
4445
import org.labkey.api.data.TableInfo;
@@ -1079,7 +1080,7 @@ public ApiResponse execute(SetRedirectUrlForm form, BindException errors) throws
10791080
return null;
10801081
}
10811082

1082-
PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(getContainer(), REDIRECT_URL_DOMAIN, true);
1083+
WritablePropertyMap props = PropertyManager.getWritableProperties(getContainer(), REDIRECT_URL_DOMAIN, true);
10831084
props.put(REDIRECT_URL_PROP, StringUtils.trimToNull(form.getUrl()));
10841085
props.save();
10851086

‎LDK/src/org/labkey/ldk/notification/NotificationServiceImpl.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.labkey.api.data.Container;
3131
import org.labkey.api.data.ContainerManager;
3232
import org.labkey.api.data.PropertyManager;
33+
import org.labkey.api.data.PropertyManager.WritablePropertyMap;
3334
import org.labkey.api.data.SimpleFilter;
3435
import org.labkey.api.data.Table;
3536
import org.labkey.api.data.TableInfo;
@@ -169,7 +170,7 @@ public boolean isServiceEnabled()
169170

170171
public void setServiceEnabled(Boolean status)
171172
{
172-
PropertyManager.PropertyMap pm = PropertyManager.getWritableProperties(ContainerManager.getRoot(), NotificationServiceImpl.CONFIG_PROPERTY_DOMAIN, true);
173+
WritablePropertyMap pm = PropertyManager.getWritableProperties(ContainerManager.getRoot(), NotificationServiceImpl.CONFIG_PROPERTY_DOMAIN, true);
173174
pm.put(ENABLED_PROP, status.toString());
174175
pm.save();
175176
}
@@ -226,7 +227,7 @@ public void setReturnEmail(Container c, String returnEmail)
226227
{
227228
ValidEmail email = new ValidEmail(returnEmail);
228229

229-
PropertyManager.PropertyMap pm = PropertyManager.getWritableProperties(c, NotificationServiceImpl.CONFIG_PROPERTY_DOMAIN, true);
230+
WritablePropertyMap pm = PropertyManager.getWritableProperties(c, NotificationServiceImpl.CONFIG_PROPERTY_DOMAIN, true);
230231
pm.put(RETURN_EMAIL, email.getEmailAddress());
231232
pm.save();
232233
}
@@ -250,7 +251,7 @@ public void setUser(Container c, Integer userId)
250251
{
251252
if(userId != null)
252253
{
253-
PropertyManager.PropertyMap pm = PropertyManager.getWritableProperties(c, NotificationServiceImpl.CONFIG_PROPERTY_DOMAIN, true);
254+
WritablePropertyMap pm = PropertyManager.getWritableProperties(c, NotificationServiceImpl.CONFIG_PROPERTY_DOMAIN, true);
254255
pm.put(USER_PROP, String.valueOf(userId));
255256
pm.save();
256257
}
@@ -344,7 +345,7 @@ public Date getLastRunDate(Notification n)
344345

345346
public void setLastRun(Notification n, Long lastRun)
346347
{
347-
PropertyManager.PropertyMap pm = PropertyManager.getWritableProperties(NotificationServiceImpl.TIMESTAMP_PROPERTY_DOMAIN, true);
348+
WritablePropertyMap pm = PropertyManager.getWritableProperties(NotificationServiceImpl.TIMESTAMP_PROPERTY_DOMAIN, true);
348349
pm.put(getKey(n), lastRun.toString());
349350
pm.save();
350351
}
@@ -363,7 +364,7 @@ public boolean isActive(Notification n, Container c)
363364

364365
public void setActive(Notification n, Container c, boolean active)
365366
{
366-
PropertyManager.PropertyMap pm = PropertyManager.getWritableProperties(c, NotificationServiceImpl.STATUS_PROPERTY_DOMAIN, true);
367+
WritablePropertyMap pm = PropertyManager.getWritableProperties(c, NotificationServiceImpl.STATUS_PROPERTY_DOMAIN, true);
367368
pm.put(getKey(n), active ? String.valueOf(active) : null);
368369
pm.save();
369370
}

‎LDK/src/org/labkey/ldk/notification/SiteSummaryNotification.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@
1919
import org.apache.commons.lang3.StringUtils;
2020
import org.apache.commons.lang3.time.DateUtils;
2121
import org.apache.commons.lang3.time.DurationFormatUtils;
22-
import org.apache.logging.log4j.Logger;
2322
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2424
import org.json.JSONArray;
2525
import org.json.JSONObject;
2626
import org.labkey.api.action.SpringActionController;
27+
import org.labkey.api.assay.AssayProtocolSchema;
28+
import org.labkey.api.assay.AssayProvider;
29+
import org.labkey.api.assay.AssayService;
2730
import org.labkey.api.audit.AuditLogService;
2831
import org.labkey.api.audit.AuditTypeProvider;
2932
import org.labkey.api.data.CompareType;
@@ -33,6 +36,7 @@
3336
import org.labkey.api.data.DbSchema;
3437
import org.labkey.api.data.DbScope;
3538
import org.labkey.api.data.PropertyManager;
39+
import org.labkey.api.data.PropertyManager.WritablePropertyMap;
3640
import org.labkey.api.data.SQLFragment;
3741
import org.labkey.api.data.Selector;
3842
import org.labkey.api.data.SimpleFilter;
@@ -55,9 +59,6 @@
5559
import org.labkey.api.settings.LookAndFeelProperties;
5660
import org.labkey.api.study.Study;
5761
import org.labkey.api.study.StudyService;
58-
import org.labkey.api.assay.AssayProtocolSchema;
59-
import org.labkey.api.assay.AssayProvider;
60-
import org.labkey.api.assay.AssayService;
6162
import org.labkey.api.util.JsonUtil;
6263
import org.labkey.ldk.LDKServiceImpl;
6364

@@ -155,7 +156,7 @@ private String getLastSaveString(Container c, Map<String, String> map)
155156

156157
private void saveValues(Container c, Map<String, String> saved, Map<String, String> newValues)
157158
{
158-
PropertyManager.PropertyMap map = PropertyManager.getWritableProperties(c, PROP_CATEGORY, true);
159+
WritablePropertyMap map = PropertyManager.getWritableProperties(c, PROP_CATEGORY, true);
159160

160161
Long lastSaveMills = map.containsKey(lastSave) ? Long.parseLong(map.get(lastSave)) : null;
161162

‎laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.labkey.api.data.ContainerFilter;
1111
import org.labkey.api.data.ContainerManager;
1212
import org.labkey.api.data.PropertyManager;
13+
import org.labkey.api.data.PropertyManager.WritablePropertyMap;
1314
import org.labkey.api.data.SimpleFilter;
1415
import org.labkey.api.data.TableInfo;
1516
import org.labkey.api.data.TableSelector;
@@ -184,7 +185,7 @@ public Integer getCurrentId(Container c)
184185
public void saveId(Container c, Integer value)
185186
{
186187
Container target = c.isWorkbook() ? c.getParent() : c;
187-
PropertyManager.PropertyMap map = PropertyManager.getWritableProperties(target, PROPERT_CATEGORY_BASE, true);
188+
WritablePropertyMap map = PropertyManager.getWritableProperties(target, PROPERT_CATEGORY_BASE, true);
188189
map.put(getPropertyKey(), value.toString());
189190
map.save();
190191
}

‎laboratory/src/org/labkey/laboratory/LaboratoryController.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.labkey.api.data.Container;
4343
import org.labkey.api.data.ContainerManager;
4444
import org.labkey.api.data.PropertyManager;
45+
import org.labkey.api.data.PropertyManager.WritablePropertyMap;
4546
import org.labkey.api.data.TableInfo;
4647
import org.labkey.api.exp.ChangePropertyDescriptorException;
4748
import org.labkey.api.exp.ExperimentException;
@@ -1558,7 +1559,7 @@ public ApiResponse execute(JsonDataForm form, BindException errors)
15581559
}
15591560

15601561
Map<String, Object> results = new HashMap<>();
1561-
PropertyManager.PropertyMap map = PropertyManager.getWritableProperties(getContainer(), NavItem.PROPERTY_CATEGORY, true);
1562+
WritablePropertyMap map = PropertyManager.getWritableProperties(getContainer(), NavItem.PROPERTY_CATEGORY, true);
15621563
map.clear();
15631564

15641565
JSONObject json = new JSONObject(form.getJsonData());
@@ -1614,7 +1615,7 @@ public ApiResponse execute(JsonDataForm form, BindException errors)
16141615
}
16151616

16161617
Map<String, Object> results = new HashMap<>();
1617-
PropertyManager.PropertyMap map = PropertyManager.getWritableProperties(getContainer(), NavItem.VIEW_PROPERTY_CATEGORY, true);
1618+
WritablePropertyMap map = PropertyManager.getWritableProperties(getContainer(), NavItem.VIEW_PROPERTY_CATEGORY, true);
16181619

16191620
JSONObject json = new JSONObject(form.getJsonData());
16201621
for (String key : json.keySet())
@@ -1649,7 +1650,7 @@ public ApiResponse execute(JsonDataForm form, BindException errors)
16491650

16501651
Map<String, Object> results = new HashMap<>();
16511652

1652-
PropertyManager.PropertyMap propMap = PropertyManager.getWritableProperties(getContainer(), TabbedReportItem.OVERRIDES_PROP_KEY, true);
1653+
WritablePropertyMap propMap = PropertyManager.getWritableProperties(getContainer(), TabbedReportItem.OVERRIDES_PROP_KEY, true);
16531654

16541655
List<TabbedReportItem> tabbedReports = LaboratoryService.get().getTabbedReportItems(getContainer(), getUser());
16551656
Map<String, TabbedReportItem> reportMap = new HashMap<String, TabbedReportItem>();
@@ -1708,7 +1709,7 @@ public ApiResponse execute(JsonDataForm form, BindException errors)
17081709
}
17091710

17101711
Map<String, Object> results = new HashMap<>();
1711-
PropertyManager.PropertyMap map = PropertyManager.getWritableProperties(getContainer(), AbstractAssayDataProvider.PROPERTY_CATEGORY, true);
1712+
WritablePropertyMap map = PropertyManager.getWritableProperties(getContainer(), AbstractAssayDataProvider.PROPERTY_CATEGORY, true);
17121713

17131714
JSONObject json = new JSONObject(form.getJsonData());
17141715
for (String key : json.keySet())

‎laboratory/src/org/labkey/laboratory/LaboratoryServiceImpl.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.labkey.laboratory;
1717

18-
import org.apache.logging.log4j.Logger;
1918
import org.apache.logging.log4j.LogManager;
19+
import org.apache.logging.log4j.Logger;
2020
import org.jetbrains.annotations.Nullable;
2121
import org.json.JSONObject;
2222
import org.labkey.api.assay.AssayFileWriter;
@@ -27,6 +27,7 @@
2727
import org.labkey.api.data.Container;
2828
import org.labkey.api.data.ContainerManager;
2929
import org.labkey.api.data.PropertyManager;
30+
import org.labkey.api.data.PropertyManager.WritablePropertyMap;
3031
import org.labkey.api.data.TableCustomizer;
3132
import org.labkey.api.data.TableInfo;
3233
import org.labkey.api.exp.ChangePropertyDescriptorException;
@@ -403,7 +404,7 @@ public Set<DemographicsSource> getDemographicsSources(Container c, User u) throw
403404
public void setDemographicsSources(Container c, User u, Set<DemographicsSource> sources) throws IllegalArgumentException
404405
{
405406
Container target = c.isWorkbookOrTab() ? c.getParent() : c;
406-
PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(target, DEMOGRAPHICS_PROPERTY_CATEGORY, true);
407+
WritablePropertyMap props = PropertyManager.getWritableProperties(target, DEMOGRAPHICS_PROPERTY_CATEGORY, true);
407408
props.clear();
408409

409410
Set<String> labels = new HashSet<>();
@@ -542,7 +543,7 @@ public Set<AdditionalDataSource> getAdditionalDataSources(Container c, User u) t
542543
public void setURLDataSources(Container c, User u, Set<URLDataSource> sources)
543544
{
544545
Container cc = c.isWorkbookOrTab() ? c.getParent() : c;
545-
PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(cc, URL_DATASOURCE_PROPERTY_CATEGORY, true);
546+
WritablePropertyMap props = PropertyManager.getWritableProperties(cc, URL_DATASOURCE_PROPERTY_CATEGORY, true);
546547
props.clear();
547548

548549
for (URLDataSource qd : sources)
@@ -555,7 +556,7 @@ public void setURLDataSources(Container c, User u, Set<URLDataSource> sources)
555556
public void setAdditionalDataSources(Container c, User u, Set<AdditionalDataSource> sources)
556557
{
557558
Container cc = c.isWorkbookOrTab() ? c.getParent() : c;
558-
PropertyManager.PropertyMap props = PropertyManager.getWritableProperties(cc, DATASOURCE_PROPERTY_CATEGORY, true);
559+
WritablePropertyMap props = PropertyManager.getWritableProperties(cc, DATASOURCE_PROPERTY_CATEGORY, true);
559560
props.clear();
560561

561562
for (AdditionalDataSource qd : sources)

‎laboratory/src/org/labkey/laboratory/notification/LabSummaryNotification.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
import org.apache.commons.io.FileUtils;
44
import org.apache.commons.lang3.time.DateUtils;
5-
import org.apache.logging.log4j.Logger;
65
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
77
import org.json.JSONArray;
88
import org.json.JSONObject;
99
import org.labkey.api.action.SpringActionController;
1010
import org.labkey.api.data.Container;
1111
import org.labkey.api.data.CoreSchema;
1212
import org.labkey.api.data.PropertyManager;
13+
import org.labkey.api.data.PropertyManager.WritablePropertyMap;
1314
import org.labkey.api.data.SimpleFilter;
1415
import org.labkey.api.data.TableInfo;
1516
import org.labkey.api.data.TableSelector;
@@ -102,7 +103,7 @@ private Map<String, String> getSavedValues(Container c)
102103

103104
private void saveValues(Container c, Map<String, String> saved, Map<String, String> newValues)
104105
{
105-
PropertyManager.PropertyMap map = PropertyManager.getWritableProperties(c, PROP_CATEGORY, true);
106+
WritablePropertyMap map = PropertyManager.getWritableProperties(c, PROP_CATEGORY, true);
106107

107108
Long lastSaveMills = map.containsKey(lastSave) ? Long.parseLong(map.get(lastSave)) : null;
108109

0 commit comments

Comments
 (0)