Extend BaseRowsCommand

Author: labkey-nicka

src/org/labkey/remoteapi/query/SaveRowsCommand.java

@@ -1,8 +1,11 @@
 package org.labkey.remoteapi.query;
 
 import org.json.JSONObject;
+import org.labkey.remoteapi.CommandException;
+import org.labkey.remoteapi.Connection;
 import org.labkey.remoteapi.PostCommand;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -153,136 +156,105 @@ public enum CommandType
         Delete
     }
 
-    public static class Command
+    public static class Command extends BaseRowsCommand
     {
-        BaseRowsCommand.AuditBehavior _auditBehavior;
-        String _auditUserComment;
         final CommandType _commandType;
         String _containerPath;
-        Map<String, Object> _extraContext;
-        List<Map<String, Object>> _rows;
-        final String _queryName;
-        final String _schemaName;
         Boolean _skipReselectRows;
 
         public Command(CommandType commandType, String schemaName, String queryName, List<Map<String, Object>> rows)
         {
+            super(schemaName, queryName, null);
             assert null != commandType;
-            assert null != schemaName && !schemaName.isEmpty();
-            assert null != queryName && !queryName.isEmpty();
-
             _commandType = commandType;
-            _schemaName = schemaName;
-            _queryName = queryName;
-            _rows = rows;
+            setRows(rows);
         }
 
         public JSONObject getJsonObject()
         {
-            JSONObject json = new JSONObject();
-
+            JSONObject json = super.getJsonObject();
             json.put("command", getCommandType().name().toLowerCase());
-            json.put("schemaName", getSchemaName());
-            json.put("queryName", getQueryName());
-            json.put("rows", getRows());
-
-            if (getAuditBehavior() != null)
-                json.put("auditBehavior", getAuditBehavior());
-
-            if (getAuditUserComment() != null && !getAuditUserComment().isEmpty())
-                json.put("auditUserComment", getAuditUserComment());
 
             if (getContainerPath() != null && !getContainerPath().isEmpty())
                 json.put("containerPath", getContainerPath());
 
-            if (getExtraContext() != null && !getExtraContext().isEmpty())
-                json.put("extraContext", getExtraContext());
-
             if (isSkipReselectRows() != null)
                 json.put("skipReselectRows", isSkipReselectRows());
 
             return json;
         }
 
-        public BaseRowsCommand.AuditBehavior getAuditBehavior()
-        {
-            return _auditBehavior;
-        }
-
-        public Command setAuditBehavior(BaseRowsCommand.AuditBehavior auditBehavior)
-        {
-            _auditBehavior = auditBehavior;
-            return this;
-        }
-
-        public String getAuditUserComment()
+        public CommandType getCommandType()
         {
-            return _auditUserComment;
+            return _commandType;
         }
 
-        public Command setAuditUserComment(String auditUserComment)
+        public String getContainerPath()
         {
-            _auditUserComment = auditUserComment;
-            return this;
+            return _containerPath;
         }
 
-        public CommandType getCommandType()
+        public void setContainerPath(String containerPath)
         {
-            return _commandType;
+            _containerPath = containerPath;
         }
 
-        public String getContainerPath()
+        public Boolean isSkipReselectRows()
         {
-            return _containerPath;
+            return _skipReselectRows;
         }
 
-        public Command setContainerPath(String containerPath)
+        public void setSkipReselectRows(Boolean skipReselectRows)
         {
-            _containerPath = containerPath;
-            return this;
+            _skipReselectRows = skipReselectRows;
         }
 
-        public Map<String, Object> getExtraContext()
+        @Override
+        public String getActionName()
         {
-            return _extraContext;
+            throw new UnsupportedOperationException(unsupportedMethodMessage());
         }
 
-        public Command setExtraContext(Map<String, Object> extraContext)
+        @Override
+        public String getControllerName()
         {
-            _extraContext = extraContext;
-            return this;
+            throw new UnsupportedOperationException(unsupportedMethodMessage());
         }
 
-        public String getQueryName()
+        @Override
+        public RowsResponse execute(Connection connection, String folderPath) throws IOException, CommandException
         {
-            return _queryName;
+            throw new UnsupportedOperationException(unsupportedMethodMessage());
         }
 
-        public String getSchemaName()
+        @Override
+        public double getRequiredVersion()
         {
-            return _schemaName;
+            throw new UnsupportedOperationException(unsupportedMethodMessage());
         }
 
-        public List<Map<String, Object>> getRows()
+        @Override
+        public void setRequiredVersion(double requiredVersion)
         {
-            return _rows;
+            throw new UnsupportedOperationException(unsupportedMethodMessage());
         }
 
-        public Command setRows(List<Map<String, Object>> rows)
+        @Override
+        public Integer getTimeout()
         {
-            _rows = rows;
-            return this;
+            throw new UnsupportedOperationException(unsupportedMethodMessage());
         }
 
-        public Boolean isSkipReselectRows()
+        @Override
+        public void setTimeout(Integer timeout)
         {
-            return _skipReselectRows;
+            throw new UnsupportedOperationException(unsupportedMethodMessage());
         }
 
-        public Command setSkipReselectRows(Boolean skipReselectRows)
+        private String unsupportedMethodMessage()
         {
-            _skipReselectRows = skipReselectRows;
-            return this;
+            // "Command does not support methodName()."
+            return Command.class.getSimpleName() + " does not support " + new Throwable().getStackTrace()[1].getMethodName() + "().";
         }
     }
 }