add responseValueInfo class instead of string split

src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt

@@ -17,6 +17,7 @@ import chip.clusterinfo.ClusterCommandCallback
 import chip.clusterinfo.ClusterInfo
 import chip.clusterinfo.CommandInfo
 import chip.clusterinfo.DelegatedClusterCallback
+import chip.clusterinfo.ResponseValueInfo
 import chip.devicecontroller.ChipClusters
 import chip.devicecontroller.ChipDeviceController
 import com.google.chip.chiptool.ChipClient
@@ -136,7 +137,7 @@ class ClusterDetailFragment : Fragment() {
       selectedCommandCallback = selectedCommandInfo.commandCallbackSupplier.get()
       populateCommandParameter(inflater, parameterList)
       selectedCommandCallback!!.setCallbackDelegate(object : ClusterCommandCallback {
-        override fun onSuccess(responseValues: Map<String, Any>) {
+        override fun onSuccess(responseValues: Map<ResponseValueInfo, Any>) {
           showMessage("Command success")
           // Populate UI based on response values. We know the types from CommandInfo.getCommandResponses().
           requireActivity().runOnUiThread {
@@ -168,15 +169,15 @@ class ClusterDetailFragment : Fragment() {
   }
 
   private fun populateCallbackResult(
-    responseValues: Map<String, Any>,
+    responseValues: Map<ResponseValueInfo, Any>,
     inflater: LayoutInflater,
     callbackList: LinearLayout
   ) {
     responseValues.forEach { (variableNameType, response) ->
       val callback = inflater.inflate(R.layout.callback_item, null, false) as LinearLayout
-      callback.callbackName.text = variableNameType.split(',')[0]
+      callback.callbackName.text = variableNameType.name
       callback.callbackData.text = response.toString()
-      callback.callbackType.text = variableNameType.split(',')[1]
+      callback.callbackType.text = variableNameType.type
       callbackList.addView(callback)
     }
   }

src/controller/java/BUILD.gn

@@ -71,6 +71,7 @@ android_library("java") {
     "src/chip/clusterinfo/ClusterInfo.java",
     "src/chip/clusterinfo/CommandInfo.java",
     "src/chip/clusterinfo/CommandParameterInfo.java",
+    "src/chip/clusterinfo/ResponseValueInfo.java",
     "src/chip/clusterinfo/DelegatedClusterCallback.java",
     "src/chip/devicecontroller/ChipClusterException.java",
     "src/chip/devicecontroller/ChipCommandType.java",

src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java

@@ -7,7 +7,7 @@
  * Interface for making customized callback that implements both onSuccess and onFailure functions.
  */
 public interface ClusterCommandCallback {
-  void onSuccess(Map<String, Object> responseValues);
+  void onSuccess(Map<ResponseValueInfo, Object> responseValues);
 
   void onFailure(Exception exception);
 }

src/controller/java/src/chip/clusterinfo/ResponseValueInfo.java

@@ -0,0 +1,14 @@
+package chip.clusterinfo;
+
+/** CommandParameterInfo captures the name and type of a parameter */
+public class ResponseValueInfo {
+  public ResponseValueInfo() {}
+
+  public ResponseValueInfo(String name, String type) {
+    this.name = name;
+    this.type = type;
+  }
+
+  public String name;
+  public String type;
+}

src/controller/java/templates/ClusterInfo-java.zapt

@@ -13,6 +13,7 @@ import chip.clusterinfo.CommandInfo;
 import chip.clusterinfo.CommandParameterInfo;
 import chip.clusterinfo.DelegatedClusterCallback;
 import chip.clusterinfo.ClusterCommandCallback;
+import chip.clusterinfo.ResponseValueInfo;
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
 
 
@@ -29,7 +30,7 @@ public class ClusterInfoMapping {
     // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
     @Override
     public void onSuccess() {
-      Map<String, Object> responseValues = new LinkedHashMap<>();
+      Map<ResponseValueInfo, Object> responseValues = new LinkedHashMap<>();
       callback.onSuccess(responseValues);
     }
 
@@ -62,13 +63,14 @@ public class ClusterInfoMapping {
            {{/if}}
         {{/chip_cluster_response_arguments}}
         ) {
-           Map<String, Object> responseValues = new LinkedHashMap<>();
+           Map<ResponseValueInfo, Object> responseValues = new LinkedHashMap<>();
            {{#chip_cluster_response_arguments}}
              {{#if isArray}}
                // {{asSymbol label}}: {{asUnderlyingZclType type}}
                // Conversion from this type to Java is not properly implemented yet
              {{else}}
-           responseValues.put("{{asSymbol label}},{{asJavaBasicType type}}", {{asSymbol label}});
+           ResponseValueInfo {{asSymbol label}}ResponseValue = new ResponseValueInfo("{{asSymbol label}}", "{{asJavaBasicType type}}");
+           responseValues.put({{asSymbol label}}ResponseValue, {{asSymbol label}});
              {{/if}}
            {{/chip_cluster_response_arguments}}
            callback.onSuccess(responseValues);