rollback changes that were present only to support legacy test code

SVN r64512 |2019-09-18 17:57:08 +0000

Author: labkey-klum

.gitattributes

@@ -55,7 +55,6 @@ java/src/org/labkey/remoteapi/di/UpdateTransformConfigurationResponse.java -text
 java/src/org/labkey/remoteapi/domain/AbstractDomainUpdateCommand.java -text
 java/src/org/labkey/remoteapi/domain/CreateDomainCommand.java -text
 java/src/org/labkey/remoteapi/domain/Domain.java -text
-java/src/org/labkey/remoteapi/domain/DomainCommand.java -text
 java/src/org/labkey/remoteapi/domain/DomainResponse.java -text
 java/src/org/labkey/remoteapi/domain/DropDomainCommand.java -text
 java/src/org/labkey/remoteapi/domain/GetDomainCommand.java -text

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

@@ -1,12 +1,11 @@
 package org.labkey.remoteapi.domain;
 
-import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class CreateDomainCommand extends DomainCommand
+public class CreateDomainCommand extends AbstractDomainUpdateCommand
 {
     private String _kind;
     private Map<String, Object> _options = new HashMap<>();
@@ -16,33 +15,17 @@ public CreateDomainCommand(String kind, String domainName)
         super("property", "createDomain");
         _kind = kind;
 
-        setDomainName(domainName);
+        getDomainDesign().setName(domainName);
     }
 
     @Override
     public JSONObject getJsonObject()
     {
         JSONObject result = super.getJsonObject();
 
-        result.put("kind", getKind());
+        result.put("kind", _kind);
         result.put("options", _options);
 
-        JSONArray fields = new JSONArray();
-        fields.addAll(getColumns());
-
-        JSONObject domainDesign = new JSONObject();
-        domainDesign.put("name", getDomainName());
-        domainDesign.put("fields", fields);
-
-        result.put("domainDesign", domainDesign);
-
-        if (!getOptions().isEmpty())
-        {
-            JSONObject domainOptions = new JSONObject();
-            domainOptions.putAll(getOptions());
-            result.put("options", domainOptions);
-        }
-
         return result;
     }
 
@@ -56,4 +39,13 @@ public void setKind(String kind)
         _kind = kind;
     }
 
+    public Map<String, Object> getOptions()
+    {
+        return _options;
+    }
+
+    public void setOptions(Map<String, Object> options)
+    {
+        _options = options;
+    }
 }

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

@@ -4,9 +4,6 @@
 import org.labkey.remoteapi.Command;
 import org.labkey.remoteapi.CommandResponse;
 
-import java.util.List;
-import java.util.Map;
-
 public class DomainResponse extends CommandResponse
 {
     private Domain _domain;
@@ -18,22 +15,7 @@ public DomainResponse(String text, int statusCode, String contentType, JSONObjec
     }
 
     public Domain getDomain()
-    { 
-        return _domain;
-    }
-
-    public List<Map<String, Object>> getColumns()
     {
-        return (List<Map<String, Object>>) getParsedData().get("fields");
-    }
-
-    public Long getDomainId()
-    {
-        return (Long)getParsedData().get("domainId");
-    }
-
-    public String getDomainURI()
-    {
-        return (String)getParsedData().get("domainURI");
+        return _domain;
     }
 }