Item 6599: Java remote api Domain and ProtocolDescriptor object params for use with assay protocols

- assay-saveProtocol.api call expects the "URL" and "PHI" properties to be lowercase for some reason

SVN r64862 |2019-12-17 22:23:34 +0000

Author: cnathe

java/src/org/labkey/remoteapi/domain/Domain.java

@@ -48,6 +48,11 @@ public Domain(JSONObject json)
     }
 
     public JSONObject toJSONObject()
+    {
+        return toJSONObject(false);
+    }
+
+    public JSONObject toJSONObject(boolean forProtocol)
     {
         JSONObject result = new JSONObject();
 
@@ -63,7 +68,7 @@ public JSONObject toJSONObject()
         result.put("fields", fields);
         for (PropertyDescriptor field : _fields)
         {
-            fields.add(field.toJSONObject());
+            fields.add(field.toJSONObject(forProtocol));
         }
         return result;
     }

java/src/org/labkey/remoteapi/domain/PropertyDescriptor.java

@@ -78,6 +78,11 @@ public PropertyDescriptor(JSONObject json)
     }
 
     public JSONObject toJSONObject()
+    {
+        return toJSONObject(false);
+    }
+
+    public JSONObject toJSONObject(boolean forProtocol)
     {
         JSONObject result = new JSONObject();
 
@@ -104,6 +109,15 @@ public JSONObject toJSONObject()
             result.put("lookupQuery", _lookupQuery);
             result.put("lookupContainer", _lookupContainer);
         }
+
+        if (forProtocol)
+        {
+            result.put("url", result.get("URL"));
+            result.remove("URL");
+            result.put("phi", result.get("PHI"));
+            result.remove("PHI");
+        }
+
         return result;
     }