Skip to content

Commit 46828f9

Browse files
authored
Support DerivationDataScope domain property (#28)
1 parent ce3d889 commit 46828f9

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

labkey-client-api/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# The LabKey Remote API Library for Java - Change Log
22

33
## version 1.5.1
4-
*Released*: TBD
4+
*Released*: 7 July 2022
55
* Fix NPE when saving assay protocol with transform scripts
6+
* Add derivationDataScope to PropertyDescriptor
67

78
## version 1.5.0
89
*Released*: 20 April 2022

labkey-client-api/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ repositories {
5757

5858
group "org.labkey.api"
5959

60-
version "1.5.1-SNAPSHOT"
60+
version "1.6.0-SNAPSHOT"
6161

6262
dependencies {
6363
implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}"

labkey-client-api/src/org/labkey/remoteapi/domain/PropertyDescriptor.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class PropertyDescriptor extends ResponseObject
2626
private String _lookupSchema;
2727
private String _lookupQuery;
2828
private String _lookupContainer;
29+
private String _derivationDataScope;
2930
private List<ConditionalFormat> _conditionalFormats = new ArrayList<>();
3031

3132
public PropertyDescriptor()
@@ -85,6 +86,8 @@ public PropertyDescriptor(JSONObject json)
8586
_lookupQuery = (String)json.get("lookupQuery");
8687
if (json.get("lookupContainer") != null)
8788
_lookupContainer = (String)json.get("lookupContainer");
89+
if (json.get("derivationDataScope") != null)
90+
_derivationDataScope = (String)json.get("derivationDataScope");
8891
if (json.get("mvEnabled") != null)
8992
_mvEnabled = (Boolean)json.get("mvEnabled");
9093
}
@@ -115,6 +118,9 @@ public JSONObject toJSONObject(boolean forProtocol)
115118
result.put("propertyURI", _propertyURI);
116119
result.put("conditionalFormats", serializeConditionalFormats());
117120

121+
if (_derivationDataScope != null)
122+
result.put("derivationDataScope", _derivationDataScope);
123+
118124
if (_rangeURI != null)
119125
result.put("rangeURI", _rangeURI);
120126

@@ -314,4 +320,15 @@ public List<ConditionalFormat> getConditionalFormats()
314320
{
315321
return Collections.unmodifiableList(_conditionalFormats);
316322
}
323+
324+
public String getDerivationDataScope()
325+
{
326+
return _derivationDataScope;
327+
}
328+
329+
public void setDerivationDataScope(String derivationDataScope)
330+
{
331+
_derivationDataScope = derivationDataScope;
332+
}
333+
317334
}

0 commit comments

Comments
 (0)