0.70.4

* Fix DSAction.prepareParameters() not being called.

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.70.3'
+    version '0.70.4'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

dslink-v2-api/src/main/java/org/iot/dsa/dslink/Value.java

@@ -17,7 +17,6 @@ public interface Value extends Node {
     /**
      * Does not have to be the current value, used to determine the type
      * of the value.
-     * @return
      */
     public DSIValue toValue();
 

dslink-v2-api/src/main/java/org/iot/dsa/node/action/DSAction.java

@@ -6,6 +6,7 @@
 import org.iot.dsa.node.DSIMetadata;
 import org.iot.dsa.node.DSIObject;
 import org.iot.dsa.node.DSIValue;
+import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSMetadata;
 
@@ -208,9 +209,15 @@ public int getParameterCount() {
         return -1;
     }
 
+    /**
+     * Puts the metadata from an already added parameter into the bucket, and calls prepareParameter
+     * so that is can be updated for any current state.
+     * @see #prepareParameter(DSInfo, DSMap)
+     */
     @Override
-    public void getParameterMetadata(int idx, DSMap bucket) {
+    public void getParameterMetadata(DSInfo target, int idx, DSMap bucket) {
         bucket.putAll(parameters.get(idx));
+        prepareParameter(target, bucket);
     }
 
     @Override
@@ -228,6 +235,17 @@ public ActionResults invoke(DSIActionRequest request) {
         return null;
     }
 
+    /**
+     * Called for each parameter as it is being sent to the requester in response to a list
+     * request. The intent is to update the default value to represent the current state of the
+     * target.  Does nothing by default.
+     *
+     * @param target    The target of the action.
+     * @param parameter Map representing a single parameter.
+     */
+    public void prepareParameter(DSInfo target, DSMap parameter) {
+    }
+
     /**
      * Sets the action group, which is null by default.
      */

dslink-v2-api/src/main/java/org/iot/dsa/node/action/DSIAction.java

@@ -100,17 +100,6 @@ public default ActionResults makeResults(DSIActionRequest req, DSIResults res) {
         return toResults(req, res);
     }
 
-    /**
-     * Called for each parameter as it is being sent to the requester in response to a list
-     * request. The intent is to update the default value to represent the current state of the
-     * target.  Does nothing by default.
-     *
-     * @param target    The info about the target of the action (its parent).
-     * @param parameter Map representing a single parameter.
-     */
-    public default void prepareParameter(DSInfo target, DSMap parameter) {
-    }
-
     /**
      * Makes an aync action result for the given parameters.  If the DIResult defines columns those
      * will be used, otherwise the columns defined by the action will be used.

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java

@@ -29,6 +29,7 @@
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.node.DSPath;
 import org.iot.dsa.node.DSString;
+import org.iot.dsa.node.action.DSIAction;
 import org.iot.dsa.node.event.DSEvent;
 import org.iot.dsa.node.event.DSISubscriber;
 import org.iot.dsa.node.event.DSISubscription;
@@ -451,14 +452,22 @@ private void encodeAction(Action action, DSMap cacheMap) {
                 enqueue("$invokable", "read");
             }
         }
+        DSIAction dsiAction = null;
+        if (action instanceof DSIAction) {
+            dsiAction = (DSIAction) action;
+        }
         e = cacheMap.remove("$params");
         if (e != null) {
             enqueue("$params", e);
         } else {
             DSList list = new DSList();
             for (int i = 0, len = action.getParameterCount(); i < len; i++) {
                 DSMap param = new DSMap();
-                action.getParameterMetadata(i, param);
+                if (dsiAction != null) {
+                    dsiAction.getParameterMetadata(target.getParentInfo(), i, param);
+                } else {
+                    action.getParameterMetadata(i, param);
+                }
                 fixRangeTypes(param);
                 list.add(param);
             }
@@ -471,7 +480,11 @@ private void encodeAction(Action action, DSMap cacheMap) {
             DSList list = new DSList();
             for (int i = 0, len = action.getColumnCount(); i < len; i++) {
                 DSMap col = new DSMap();
-                action.getColumnMetadata(i, col);
+                if (dsiAction != null) {
+                    dsiAction.getColumnMetadata(target.getParentInfo(), i, col);
+                } else {
+                    action.getColumnMetadata(i, col);
+                }
                 fixRangeTypes(col);
                 list.add(col);
             }